Commit 4a48f501 authored by Raphaël Hertzog's avatar Raphaël Hertzog
Browse files

Merge branch 'debian'

Conflicts:
	debian/changelog
parents bc43671b bfaf1ce5
......@@ -30,10 +30,9 @@ then
man live-build
exit 0
else
Echo "live-build is a set of scripts to build Debian Live system images."
echo
Echo "The idea behind live-build is a framework that uses a configuration directory to completely automate and customize all aspects of building a Live image."
Echo "live-build contains the scripts to build a Debian Live system from a configuration directory."
echo
Echo "An introduction to live-build can be found in the live-build(7) manpage."
exit 0
fi
The grub splash for Debian Live was made by Daniel Baumann <daniel@debian.org>
based on the original work of Mark Riedesel.
The contribution of Daniel is hereby placed in the public domain (no rights
reserved).
---------------
http://dugnet.com/klown/pics/klowner_debboot.png
by Mark Riedesel, license same as open use logo
To create klowner.rle:
1. convert klowner.png klowner.bmp
2. bmptoppm < klowner.bmp | ppmtolss16 #FBFDFA=7 > klowner.rle
(FBFDFA is the color used for the inside of the "n" in Debian.)
---------------
Debian Open Use Logo License
Copyright (c) 1999 Software in the Public Interest
This logo or a modified version may be used by anyone to refer to the Debian
project, but does not indicate endorsement by the project.
Note: we would appreciate that you make the image a link to
http://www.debian.org/ if you use it on a web page.
live-build (3.0.5-1) unstable; urgency=low
* Skipping loadlin inclusion on netboot images.
-- Daniel Baumann <daniel@debian.org> Tue, 30 Apr 2013 10:26:09 +0200
live-build (3.0.4-1) unstable; urgency=low
* Correcting variable typo when setting distribution specific defaults
of the backports mirror for the binary image.
-- Daniel Baumann <daniel@debian.org> Mon, 29 Apr 2013 12:47:24 +0200
live-build (3.0.3-1) unstable; urgency=low
* Updating debian-backports mirrors for wheezy.
* Enabling release updates (formerly known as volatile) for wheezy.
-- Daniel Baumann <daniel@debian.org> Thu, 25 Apr 2013 17:39:31 +0200
live-build (3.0.2-1) unstable; urgency=low
[ Daniel Baumann ]
* Allowing to use parted its automatic offset handling at the beginning
of a disk, rather than to harcode it to first block (Closes: #647607).
* Aborting with error if hdd label has a whitespace (Closes: #648861).
* Updating d-i suite symlink for wheezy release.
* Correcting typo in grub2 config template.
* Synchronise grub and grub2 splashes with internal live-build splash
for syslinux bootloaders.
* Removing non-existent --apt-indices none references.
* Also showing distribution in lb config initial messages.
* Making messages about reading system conffiles in lb config more
accurate.
* Harmonize handling of pre-existing gnupg dotfiles in chroot when
handling fake signing keys for local repository.
* Making some more debian source-selections conditional on certain image
options.
* Adding source_hooks for hooks on source images like already supported
on binary images.
[ Richard Nelson ]
* Add sanity check on config type to build for l-b-cgi.
* Add _CGI_CONFIG_APPEND varialbe for appending options to lb config
call on l-b-cgi frontend.
* Change _CGI_CONFIG_APPEND to front of the lb config call on l-b-cgi
frontend.
* Removing quotes around _CGI_CONFIG_APPEND to handle multiple
parameters correctly on l-b-cgi frontend.
* Adding binary image type to config call on l-b-cgi frontend.
* Add log information of git:://url for l-b-cgi frontend.
* Append to log file on errors and not truncate the file on l-b-cgi
frontend.
[ Daniel Baumann ]
* Correcting spelling typos, thanks to Adam D. Barratt <adam@adam-
barratt.org.uk>.
[ Raphaël Hertzog ]
* Fixing win32-loader.ini by including the GTK related entries.
[ Daniel Baumann ]
* Correcting typo directory when dereferencing syslinux symlinks when
building chrooted, thanks to Luigi Capriotti <l.capriotti@xbmc.org>.
* Using dpkg-divert in chroot_upstart script to handle upgrades of
upstart during the build (Closes: #702537).
* Using dpkg-divert for other diversions too to handle upgrades of the
diverted stuff during build.
* Adding generic live-build handle in chroot_dpkg for other live
packages to act upon.
* Updating fallback help message in live-build pseudo-command.
* Correcting grammer error in live-build description.
* Adding set -e in example auto scripts.
[ Richard Nelson ]
* Converting l-b-cgi frontend to process forms with post.
[ Daniel Baumann ]
* Cleaning up installer file locations for progress-linux.
* Stripping out comments in package lists.
* Updating derivatives archive-key signature validiation to look by
default at both debian and debian-maintainers keyrings.
* Updating bootstrap mirror for progress-linux.
-- Daniel Baumann <daniel@debian.org> Thu, 25 Apr 2013 12:41:54 +0200
live-build (3.0.1-1+kali1) kali; urgency=low
* Fix win32-loader.
......
......@@ -20,7 +20,7 @@ Suggests:
mtools, parted, squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub,
uuid-runtime, win32-loader
Description: Live System Build Scripts
live-build contains the scripts that build a live system from a configuration
live-build contains the scripts to build a live system from a configuration
directory.
Package: live-build-cgi
......@@ -28,7 +28,7 @@ Architecture: all
Depends: ${misc:Depends}, live-build (= ${source:Version})
Recommends: apache2 | httpd, cron
Description: Live System Build Scripts (CGI frontend)
live-build contains the scripts that build a live system from a configuration
live-build contains the scripts to build a live system from a configuration
directory.
.
This package contains the CGI frontend (experimental!).
......@@ -7,10 +7,6 @@ Files: *
Copyright: 2006-2013 Daniel Baumann <daniel@debian.org>
License: GPL-3+
Files: contrib/grub-splash/lenny
Copyright: n/a
License: other
Files: share/bootloaders/*/splash.svg.in
Copyright: 2006-2013 Daniel Baumann <daniel@debian.org>
License: other
......@@ -32,33 +28,6 @@ License: GPL-3+
The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-3 file.
License: other
The splash for Debian Live was made by Daniel Baumann <daniel@debian.org> based
on the original work of Mark Riedesel.
.
The contribution of Daniel is hereby placed in the public domain (no rights
reserved).
.
---------------
http://dugnet.com/klown/pics/klowner_debboot.png
by Mark Riedesel, license same as open use logo
.
To create klowner.rle:
.
1. convert klowner.png klowner.bmp
2. bmptoppm < klowner.bmp | ppmtolss16 #FBFDFA=7 > klowner.rle
(FBFDFA is the color used for the inside of the "n" in Debian.)
---------------
.
Debian Open Use Logo License
.
Copyright (c) 1999 Software in the Public Interest
This logo or a modified version may be used by anyone to refer to the Debian
project, but does not indicate endorsement by the project.
.
Note: we would appreciate that you make the image a link to
http://www.debian.org/ if you use it on a web page.
License: other
The splash for Debian Live was made by Daniel Baumann <daniel@debian.org> based
on the Debian Open Use Logo.
......
#!/bin/sh
set -e
lb build noauto "${@}" 2>&1 | tee build.log
#!/bin/sh
set -e
lb clean noauto "${@}"
rm -f config/binary config/bootstrap config/chroot config/common config/source
......
#!/bin/sh
set -e
lb config noauto \
"${@}"
......@@ -32,6 +32,14 @@ fi
echo "Content-type: text/html"
echo
#QUERY_STRING=`cat /dev/stdin`
QUERY_STRING=$(cat /dev/stdin)
# Translate parameters
QUERY_STRING=$(echo "${QUERY_STRING}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g' -e 's/%3D/=/g' -e 's/%2B/+/g')
# Debug the filtering string
# echo ${QUERY_STRING}
# Sending html header
cat "${_TEMPLATES}"/header.html
......@@ -52,11 +60,6 @@ else
# Converting '=': sed 's/%3D/=/g'
# Converting '+': sed 's/%2B/+/g'
# Translate parameters
QUERY_STRING=$(echo "${QUERY_STRING}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g' -e 's/%3D/=/g' -e 's/%2B/+/g')
# Debug the filtering string
# echo ${QUERY_STRING}
# Email
_EMAIL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])email=[-0-9a-zA-Z._@]+' | cut -f 2 -d '=' | head -n1)
......
......@@ -63,15 +63,25 @@ then
# Pull in variables from the build file.
. "${_FILE}"
# Drop out some build data for information if something goes wrong.
echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live
# Clone the git config to target build directory
git clone ${_LB_GIT} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live
_ERRORGIT="${?}"
# Sanity check to default to something since we are going to build from git clone.
if [ -z "${_LB_CONFIG}" ]
then
_LB_CONFIG="standard"
fi
# Now set a variable for the correct build path
_BUILD_PATH="${_TEMPDIR}/${_BUILD}/images/${_LB_CONFIG}"
# Drop out some build data for information if something goes wrong.
echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live
_DATE_START="`date -R`"
echo "Begin live-build-cgi: ${_DATE_START}" > "${_BUILD_PATH}"/log
echo "Info live-build-cgi: Config tree cloned from ${_LB_GIT} for build ${_BUILD}" >> "${_BUILD_PATH}"/log
# Creating directory for the config/package-lists
mkdir -p "${_BUILD_PATH}"/config/package-lists
......@@ -82,18 +92,15 @@ then
echo "${_LB_CGIPACKAGES}" > "${_BUILD_PATH}"/config/package-lists/cgipackages.list.chroot
fi
_DATE_START="`date -R`"
echo "Begin: ${_DATE_START}" > "${_BUILD_PATH}"/log
# Generating config here
if [ "${_ERRORGIT}" -eq "0" ]
then
cd "${_BUILD_PATH}"
# Do config with git and stack on config file params to build
lb config --distribution "${LB_DISTRIBUTION}" --architectures "${LB_ARCHITECTURES}" --archive-areas "${LB_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
lb config ${_CGI_CONFIG_APPEND} --distribution "${LB_DISTRIBUTION}" --binary-images "${LB_BINARY_IMAGES}" --architectures "${LB_ARCHITECTURES}" --archive-areas "${LB_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
_ERRORCONFIG="${?}"
else
echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" > "${_BUILD_PATH}"/log
echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" >> "${_BUILD_PATH}"/log
fi
# Run build if config went ok
......@@ -102,7 +109,7 @@ then
lb build >> "${_BUILD_PATH}"/log 2>&1
_ERRORBUILD="${?}"
else
echo "Build stage skipped. Config produced an error: ${_ERRORCONFIG}" > "${_BUILD_PATH}"/log
echo "Build stage skipped. Config produced an error: ${_ERRORCONFIG}" >> "${_BUILD_PATH}"/log
fi
_DATE_END="`date -R`"
......
......@@ -13,3 +13,5 @@ _TEMPDIR="/srv/debian-live/build/tmp"
_SERVER="http://live.debian.net/build"
_LB_GIT="git://live-systems.org/git/live-images.git"
_CGI_CONFIG_APPEND=""
......@@ -362,7 +362,7 @@ Set_defaults ()
progress-linux)
LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ftp.debian.org/debian/}"
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/progress/}"
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/packages/}"
;;
ubuntu)
......@@ -445,7 +445,16 @@ Set_defaults ()
# Setting backports mirror to fetch packages from
case "${LB_MODE}" in
debian)
LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-http://backports.debian.org/debian-backports/}"
case "${LB_DISTRIBUTION}" in
squeeze)
LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-http://backports.debian.org/debian-backports/}"
;;
*)
LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-${LB_MIRROR_CHROOT}}"
;;
esac
LB_PARENT_MIRROR_CHROOT_BACKPORTS="${LB_PARENT_MIRROR_CHROOT_BACKPORTS:-${LB_MIRROR_CHROOT_BACKPORTS}}"
;;
......@@ -557,7 +566,16 @@ Set_defaults ()
# Setting backports mirror which ends up in the image
case "${LB_MODE}" in
debian)
LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-http://http.debian.net/debian-backports/}"
case "${LB_DISTRIBUTION}" in
squeeze)
LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-http://http.debian.net/debian-backports/}"
;;
*)
LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-${LB_MIRROR_BINARY}}"
;;
esac
LB_PARENT_MIRROR_BINARY_BACKPORTS="${LB_PARENT_MIRROR_BINARY_BACKPORTS:-${LB_MIRROR_BINARY_BACKPORTS}}"
;;
......@@ -813,7 +831,7 @@ Set_defaults ()
# Setting updates updates option
case "${LB_PARENT_DISTRIBUTION}" in
wheezy|jessie|sid)
jessie|sid)
LB_UPDATES="${LB_UPDATES:-false}"
;;
......@@ -849,7 +867,7 @@ Set_defaults ()
# Setting apt indices
case "${LB_MODE}" in
progress-linux)
LB_APT_INDICES="${LB_APT_INDICES:-none}"
LB_APT_INDICES="${LB_APT_INDICES:-false}"
;;
*)
......@@ -1201,6 +1219,13 @@ Check_defaults ()
fi
fi
if echo ${LB_HDD_LABEL} | grep -qs ' '
then
Echo_error "There are currently no whitespaces supported in hdd labels."
exit 1
fi
if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then
# d-i true, no caching
......
......@@ -23,7 +23,7 @@ build: po4a.cfg
@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
then \
echo "E: po4a - command not found"; \
echo "I: po4a can be optained from http://po4a.alioth.debian.org/"; \
echo "I: po4a can be obtained from http://po4a.alioth.debian.org/"; \
echo "I: On Debian based systems, po4a can be installed with 'apt-get install po4a'."; \
exit 1; \
fi
......
.TH LIVE\-BUILD 1 2013\-02\-14 3.0.1-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-04\-30 3.0.5-1 "Debian Live Project"
.SH NAME
\fBlb\fR \- wrapper for live\-build programs
......
.TH LIVE\-BUILD 1 2013\-02\-14 3.0.1-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-04\-30 3.0.5-1 "Debian Live Project"
.SH NAME
\fBlb binary\fR \- Complete the binary stage
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment