[SCM] live-build branch, debian-next, updated. debian/3.0_a10-1-5-g5e4be0c
Daniel Baumann
daniel at debian.org
Wed Dec 29 12:01:13 UTC 2010
The following commit has been merged in the debian-next branch:
commit b694732867fb087b31b750f271413e1db4874987
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Dec 27 17:42:17 2010 +0100
Removing some more lenny-only stuff.
diff --git a/functions/defaults.sh b/functions/defaults.sh
index b3ef02d..38977a6 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -347,15 +347,7 @@ Set_defaults ()
then
case "${LB_MODE}" in
debian|debian-release)
- case "${LB_DISTRIBUTION}" in
- lenny)
- LB_MIRROR_CHROOT_VOLATILE="http://volatile.debian.org/debian-volatile/"
- ;;
-
- squeeze)
- LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT}"
- ;;
- esac
+ LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT}"
;;
ubuntu)
@@ -369,9 +361,11 @@ Set_defaults ()
;;
esac
;;
- esac
- LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-none}"
+ *)
+ LB_MIRROR_CHROOT_VOLATILE="none"
+ ;;
+ esac
fi
# Setting backports mirror to fetch packages from
@@ -379,15 +373,13 @@ Set_defaults ()
then
case "${LB_MODE}" in
debian|debian-release)
- case "${LB_DISTRIBUTION}" in
- lenny|squeeze)
- LB_MIRROR_CHROOT_BACKPORTS="http://backports.debian.org/debian-backports/"
- ;;
- esac
+ LB_MIRROR_CHROOT_BACKPORTS="http://backports.debian.org/debian-backports/"
;;
- esac
- LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-none}"
+ *)
+ LB_MIRROR_CHROOT_BACKPORTS="none"
+ ;;
+ esac
fi
# Setting mirror which ends up in the image
@@ -447,14 +439,7 @@ Set_defaults ()
then
case "${LB_MODE}" in
debian|debian-release)
- case "${LB_DISTRIBUTION}" in
- lenny)
- LB_MIRROR_BINARY_VOLATILE="http://volatile.debian.org/debian-volatile/"
- ;;
-
- squeeze)
- LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY}"
- esac
+ LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY}"
;;
ubuntu)
@@ -468,9 +453,11 @@ Set_defaults ()
;;
esac
;;
- esac
- LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY_VOLATILE:-none}"
+ *)
+ LB_MIRROR_BINARY_VOLATILE="none"
+ ;;
+ esac
fi
# Setting backports mirror which ends up in the image
@@ -478,15 +465,13 @@ Set_defaults ()
then
case "${LB_MODE}" in
debian|debian-release)
- case "${LB_DISTRIBUTION}" in
- lenny|squeeze)
- LB_MIRROR_BINARY_BACKPORTS="http://backports.debian.org/debian-backports/"
- ;;
- esac
+ LB_MIRROR_BINARY_BACKPORTS="http://backports.debian.org/debian-backports/"
;;
- esac
- LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-none}"
+ *)
+ LB_MIRROR_BINARY_BACKPORTS="none"
+ ;;
+ esac
fi
LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_BOOTSTRAP}}"
@@ -641,25 +626,12 @@ Set_defaults ()
if [ -z "${LB_LINUX_PACKAGES}" ]
then
case "${LB_MODE}" in
- debian|debian-release|embedian)
- case "${LB_DISTRIBUTION}" in
- lenny)
- LB_LINUX_PACKAGES="linux-image-2.6 \${LB_UNION_FILESYSTEM}-modules-2.6"
- ;;
-
- *)
- LB_LINUX_PACKAGES="linux-image-2.6"
- ;;
- esac
+ ubuntu)
+ LB_LINUX_PACKAGES="linux"
+ ;;
- if [ "${LB_CHROOT_FILESYSTEM}" = "squashfs" ]
- then
- case "${LB_DISTRIBUTION}" in
- lenny)
- LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES} squashfs-modules-2.6"
- ;;
- esac
- fi
+ *)
+ LB_LINUX_PACKAGES="linux-image-2.6"
case "${LB_ENCRYPTION}" in
""|false)
@@ -671,10 +643,6 @@ Set_defaults ()
;;
esac
;;
-
- ubuntu)
- LB_LINUX_PACKAGES="linux"
- ;;
esac
fi
@@ -712,60 +680,29 @@ Set_defaults ()
gnome-desktop)
LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's|gnome-desktop||') standard-x11"
- case "${LB_DISTRIBUTION}" in
- lenny)
- LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||') standard gnome-desktop desktop"
- ;;
-
- *)
- LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||' -e 's|laptop||') standard gnome-desktop desktop laptop"
- LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
- ;;
- esac
+ LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||' -e 's|laptop||') standard gnome-desktop desktop laptop"
+ LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
;;
kde-desktop)
LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's|kde-desktop||') standard-x11"
- case "${LB_DISTRIBUTION}" in
- lenny)
- LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||') standard kde-desktop desktop"
- ;;
-
- *)
- LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||' -e 's|laptop||') standard kde-desktop desktop laptop"
- LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
- esac
+ LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||' -e 's|laptop||') standard kde-desktop desktop laptop"
+ LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
;;
lxde-desktop)
LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's|lxde-desktop||') standard-x11"
- case "${LB_DISTRIBUTION}" in
- lenny)
- LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||') standard lxde-desktop desktop"
- ;;
-
- *)
- LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||' -e 's|laptop||') standard lxde-desktop desktop laptop"
- LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
- ;;
- esac
+ LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||' -e 's|laptop||') standard lxde-desktop desktop laptop"
+ LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
;;
xfce-desktop)
LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's|xfce-desktop||') standard-x11"
- case "${LB_DISTRIBUTION}" in
- lenny)
- LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||') standard xfce-desktop desktop"
- ;;
-
- *)
- LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||' -e 's|laptop||') standard xfce-desktop desktop laptop"
- LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
- ;;
- esac
+ LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||' -e 's|laptop||') standard xfce-desktop desktop laptop"
+ LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
;;
esac
done
diff --git a/functions/releases.sh b/functions/releases.sh
index d28c514..93b0374 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -9,7 +9,6 @@
# Debian releases
-RELEASE_lenny="5.0.6"
RELEASE_squeeze="6.0.0"
RELEASE_wheezy="7"
RELEASE_sid="unstable"
diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 9c6e54a..643a250 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -237,7 +237,7 @@ directory where \fBlb config\fP was executed.
.\" FIXME
Note: Currently \fBlb config\fP tries to be smart and sets defaults for some
options depending on the setting of other options (e.g. which linux packages
-to be used depending on if a lenny system gets build or not). This means
+to be used depending on if a squeeze system gets build or not). This means
that when generating a new configuration, you should call \fBlb config\fP only
once with all options specified. Calling it several times with only a subset
of the options each can result in non working configurations. This is also
@@ -299,8 +299,7 @@ right kernel. But building powerpc images on an i386 system is not possible.
.IP "\-b|\fB\-\-binary\-images\fP iso|iso\-hybrid|net|tar|usb\-hdd" 4
defines the image type to build. By default, for images using syslinux this
is set to iso\-hybrid to build CD/DVD images that may also be used like
-usb\-hdd images, for legacy lenny and non\-syslinux images, it defaults to
-iso.
+usb\-hdd images, for non\-syslinux images, it defaults to iso.
.IP "\fB\-\-binary\-filesystem\fP fat16|fat32|ext2" 4
defines the filesystem to be used in the image type. This only has an effect
if the selected binary image type does allow to choose a filesystem. For
@@ -477,9 +476,9 @@ none to disable inclusion of documentation.
sets the name of package that contains the live system specific initramfs
modification. By default, auto is used, which means that at build time of
the image rather than on configuration time, the value will be expanded to
-casper when building ubuntu systems, to live\-initramfs for legacy lenny, and
-to live\-boot for squeeze and newer. Using 'none' is useful if the resulting
-system image should not be a live image (experimental).
+casper when building ubuntu systems, to live\-boot for debian systems. Using
+\&'none' is useful if the resulting system image should not be a live image
+(experimental).
.IP "\fB\-\-interactive\fP shell" 4
defines if after the chroot stage and before the beginning of the binary
stage, a interactive shell login should be spawned in the chroot in order to
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 3f507b3..4b6fff7 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -226,7 +226,7 @@
.\" FIXME
\fBlb config\fR populates the configuration directory for live\-build. By default, this directory is named 'config' and is created in the current directory where \fBlb config\fR was executed.
.PP
-Note: Currently \fBlb config\fR tries to be smart and sets defaults for some options depending on the setting of other options (e.g. which linux packages to be used depending on if a lenny system gets build or not). This means that when generating a new configuration, you should call \fBlb config\fR only once with all options specified. Calling it several times with only a subset of the options each can result in non working configurations. This is also caused by the fact that \fBlb config\fR called with one option only changes that option, and leaves everything else as is unless its not defined. However, \fBlb config\fR does warn about know impossible or likely impossible combinations that would lead to non working live systems. If unsure, remove config/{binary,bootstrap,chroot,common,source} and call \fBlb config\fR again.
+Note: Currently \fBlb config\fR tries to be smart and sets defaults for some options depending on the setting of other options (e.g. which linux packages to be used depending on if a squeeze system gets build or not). This means that when generating a new configuration, you should call \fBlb config\fR only once with all options specified. Calling it several times with only a subset of the options each can result in non working configurations. This is also caused by the fact that \fBlb config\fR called with one option only changes that option, and leaves everything else as is unless its not defined. However, \fBlb config\fR does warn about know impossible or likely impossible combinations that would lead to non working live systems. If unsure, remove config/{binary,bootstrap,chroot,common,source} and call \fBlb config\fR again.
.\" FIXME
.SH OPTIONS
@@ -254,7 +254,7 @@ defines if apt should check repository signatures. This is true by default.
.IP "\-a|\fB\-\-architectures\fR \fIARCHITECTURE\fR" 4
defines the architecture of the to be build image. By default, this is set to the host architecture. Note that you cannot crossbuild for another architecture if your host system is not able to execute binaries for the target architecture natively. For example, building amd64 images on i386 and vice versa is possile if you have a 64bit capable i386 processor and the right kernel. But building powerpc images on an i386 system is not possible.
.IP "\-b|\fB\-\-binary\-images\fR iso|iso\-hybrid|net|tar|usb\-hdd" 4
-defines the image type to build. By default, for images using syslinux this is set to iso\-hybrid to build CD/DVD images that may also be used like usb\-hdd images, for legacy lenny and non\-syslinux images, it defaults to iso.
+defines the image type to build. By default, for images using syslinux this is set to iso\-hybrid to build CD/DVD images that may also be used like usb\-hdd images, for non\-syslinux images, it defaults to iso.
.IP "\fB\-\-binary\-filesystem\fR fat16|fat32|ext2" 4
defines the filesystem to be used in the image type. This only has an effect if the selected binary image type does allow to choose a filesystem. For example, when selection iso the resulting CD/DVD has always the filesystem ISO9660. When building usb\-hdd images for usb sticks, this is active. Note that it defaults to fat16 on all architectures except sparc where it defaults to ext2. Also note that if you choose fat16 and your resulting binary image gets bigger than 2GB, the binary filesystem automatically gets switched to fat32.
.IP "\fB\-\-bootappend\-install\fR \fIPARAMETER\fR|""\fIPARAMETERS\fR""" 4
@@ -328,7 +328,7 @@ sets the hostname of the live system.
.IP "\fB\-\-includes\fR \fIPATH|none\fR" 4
sets the path to the includes that live\-build is going to use, e.g. additional minimal documentation that you want to have on all live systems. By default, this is set to /usr/share/live/build/includes/. Choose none to disable inclusion of documentation.
.IP "\fB\-\-initramfs\fR auto|none|live\-boot|live\-initramfs|casper" 4
-sets the name of package that contains the live system specific initramfs modification. By default, auto is used, which means that at build time of the image rather than on configuration time, the value will be expanded to casper when building ubuntu systems, to live\-initramfs for legacy lenny, and to live\-boot for squeeze and newer. Using 'none' is useful if the resulting system image should not be a live image (experimental).
+sets the name of package that contains the live system specific initramfs modification. By default, auto is used, which means that at build time of the image rather than on configuration time, the value will be expanded to casper when building ubuntu systems, to live\-boot for debian systems. Using 'none' is useful if the resulting system image should not be a live image (experimental).
.IP "\fB\-\-interactive\fR shell" 4
defines if after the chroot stage and before the beginning of the binary stage, a interactive shell login should be spawned in the chroot in order to allow you to do manual customizations. Once you close the shell with logout or exit, the build will continue as usual. Note that it's strongly discouraged to use this for anything else than testing. Modifications that should be present in all builds of a live system should be properly made through hooks. Everything else destroys the beauty of being able to completely automatise the build process and making it non interactive. By default, this is of course false.
.IP "\fB\-\-isohybrid\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index a727de6..8e35cd9 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build 3.0~a10\n"
-"POT-Creation-Date: 2010-12-27 17:32+0100\n"
+"POT-Creation-Date: 2010-12-27 17:40+0100\n"
"PO-Revision-Date: 2010-11-23 12:36+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1249,7 +1249,7 @@ msgstr ""
msgid ""
"Note: Currently B<lb config> tries to be smart and sets defaults for some "
"options depending on the setting of other options (e.g. which linux packages "
-"to be used depending on if a lenny system gets build or not). This means "
+"to be used depending on if a squeeze system gets build or not). This means "
"that when generating a new configuration, you should call B<lb config> only "
"once with all options specified. Calling it several times with only a subset "
"of the options each can result in non working configurations. This is also "
@@ -1422,7 +1422,7 @@ msgstr ""
msgid ""
"defines the image type to build. By default, for images using syslinux this "
"is set to iso-hybrid to build CD/DVD images that may also be used like usb-"
-"hdd images, for legacy lenny and non-syslinux images, it defaults to iso."
+"hdd images, for non-syslinux images, it defaults to iso."
msgstr ""
#. type: IP
@@ -1964,9 +1964,9 @@ msgid ""
"sets the name of package that contains the live system specific initramfs "
"modification. By default, auto is used, which means that at build time of "
"the image rather than on configuration time, the value will be expanded to "
-"casper when building ubuntu systems, to live-initramfs for legacy lenny, and "
-"to live-boot for squeeze and newer. Using 'none' is useful if the resulting "
-"system image should not be a live image (experimental)."
+"casper when building ubuntu systems, to live-boot for debian systems. Using "
+"'none' is useful if the resulting system image should not be a live image "
+"(experimental)."
msgstr ""
#. type: IP
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 844bd34..89fff3a 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2010-12-27 17:32+0100\n"
+"POT-Creation-Date: 2010-12-27 17:40+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1249,7 +1249,7 @@ msgstr ""
msgid ""
"Note: Currently B<lb config> tries to be smart and sets defaults for some "
"options depending on the setting of other options (e.g. which linux packages "
-"to be used depending on if a lenny system gets build or not). This means "
+"to be used depending on if a squeeze system gets build or not). This means "
"that when generating a new configuration, you should call B<lb config> only "
"once with all options specified. Calling it several times with only a subset "
"of the options each can result in non working configurations. This is also "
@@ -1422,7 +1422,7 @@ msgstr ""
msgid ""
"defines the image type to build. By default, for images using syslinux this "
"is set to iso-hybrid to build CD/DVD images that may also be used like usb-"
-"hdd images, for legacy lenny and non-syslinux images, it defaults to iso."
+"hdd images, for non-syslinux images, it defaults to iso."
msgstr ""
#. type: IP
@@ -1964,9 +1964,9 @@ msgid ""
"sets the name of package that contains the live system specific initramfs "
"modification. By default, auto is used, which means that at build time of "
"the image rather than on configuration time, the value will be expanded to "
-"casper when building ubuntu systems, to live-initramfs for legacy lenny, and "
-"to live-boot for squeeze and newer. Using 'none' is useful if the resulting "
-"system image should not be a live image (experimental)."
+"casper when building ubuntu systems, to live-boot for debian systems. Using "
+"'none' is useful if the resulting system image should not be a live image "
+"(experimental)."
msgstr ""
#. type: IP
--
live-build
More information about the debian-live-changes
mailing list