From 3ceb68b7d4eb5b28269c0780a808c3725c5f5668 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 24 Aug 2011 20:34:01 +0200 Subject: Introducing --apt-sources option to control if the live system should have deb-src entries in sources.list. --- functions/defaults.sh | 3 + manpages/de/lb_config.de.1 | 5 + manpages/en/lb_config.1 | 4 + manpages/po/de/lb_config.1.po | 734 ++++++++++++++++++++------------------- manpages/pot/lb_config.1.pot | 734 ++++++++++++++++++++------------------- scripts/build/lb_binary | 2 +- scripts/build/lb_binary_rootfs | 12 +- scripts/build/lb_chroot | 4 +- scripts/build/lb_chroot_archives | 43 +-- scripts/build/lb_config | 12 +- scripts/build/lb_source | 4 +- 11 files changed, 809 insertions(+), 748 deletions(-) diff --git a/functions/defaults.sh b/functions/defaults.sh index 3fc895f44..c87237ae7 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -100,6 +100,9 @@ Set_defaults () # Setting apt secure LB_APT_SECURE="${LB_APT_SECURE:-true}" + # Setting apt source + LB_APT_SOURCE="${LB_APT_SOURCE:-true}" + # Setting bootstrap program if [ -z "${LB_BOOTSTRAP}" ] || ( [ ! -x "$(which ${LB_BOOTSTRAP} 2>/dev/null)" ] && [ "${LB_BOOTSTRAP}" != "copy" ] ) then diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1 index f3c9e8da0..4366ed1f7 100644 --- a/manpages/de/lb_config.de.1 +++ b/manpages/de/lb_config.de.1 @@ -31,6 +31,8 @@ [\fB\-\-apt\-recommends\fP true|false] .br [\fB\-\-apt\-secure\fP true|false] +.br + [\fB\-\-apt\-source\fP true|false] .br [\-a|\fB\-\-architectures\fP \fIARCHITECTURE\fP] .br @@ -305,6 +307,9 @@ defines if apt should install recommended packages automatically. By default, this is true except in emdebian mode. .IP "\fB\-\-apt\-secure\fP true|false" 4 defines if apt should check repository signatures. This is true by default. +.IP "\fB\-\-apt\-source\fP true|false" 4 +defines if deb\-src entries should be included in the resulting live image or +not, defaults to on. .IP "\-a|\fB\-\-architectures\fP \fIARCHITECTURE\fP" 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 diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index 62d2215ad..8770f9d70 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -26,6 +26,8 @@ [\fB\-\-apt\-recommends\fR true|false] .br [\fB\-\-apt\-secure\fR true|false] +.br + [\fB\-\-apt\-source\fR true|false] .br [\-a|\fB\-\-architectures\fR \fIARCHITECTURE\fR] .br @@ -267,6 +269,8 @@ sets the depth of the apt/aptitude pipeline. In cases where the remote server is defines if apt should install recommended packages automatically. By default, this is true except in emdebian mode. .IP "\fB\-\-apt\-secure\fR true|false" 4 defines if apt should check repository signatures. This is true by default. +.IP "\fB\-\-apt\-source\fR true|false" 4 +defines if deb-src entries should be included in the resulting live image or not, defaults to on. .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 diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po index b65d0d018..3fc114717 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 VERSION\n" -"POT-Creation-Date: 2011-08-24 19:35+0300\n" +"POT-Creation-Date: 2011-08-24 20:34+0300\n" "PO-Revision-Date: 2011-08-16 20:48+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -231,7 +231,7 @@ msgstr "" #: en/lb_chroot_preseed.1:9 en/lb_chroot_proc.1:9 en/lb_chroot_resolv.1:9 #: en/lb_chroot_selinuxfs.1:9 en/lb_chroot_sysfs.1:9 en/lb_chroot_sysv-rc.1:9 #: en/lb_chroot_task-lists.1:9 en/lb_chroot_upstart.1:9 en/lb_clean.1:9 -#: en/lb_config.1:239 en/lb_local.1:9 en/lb_source.1:9 +#: en/lb_config.1:241 en/lb_local.1:9 en/lb_source.1:9 #: en/lb_source_checksums.1:9 en/lb_source_debian-live.1:9 #: en/lb_source_debian.1:9 en/lb_source_disk.1:9 en/lb_source_iso.1:9 #: en/lb_source_net.1:9 en/lb_source_tar.1:9 en/lb_source_usb.1:9 @@ -264,7 +264,7 @@ msgstr "" #: en/lb_chroot_preseed.1:14 en/lb_chroot_proc.1:14 en/lb_chroot_resolv.1:14 #: en/lb_chroot_selinuxfs.1:14 en/lb_chroot_sysfs.1:14 #: en/lb_chroot_sysv-rc.1:14 en/lb_chroot_task-lists.1:14 -#: en/lb_chroot_upstart.1:14 en/lb_clean.1:16 en/lb_config.1:248 +#: en/lb_chroot_upstart.1:14 en/lb_clean.1:16 en/lb_config.1:250 #: en/lb_local.1:14 en/lb_source.1:14 en/lb_source_checksums.1:14 #: en/lb_source_debian-live.1:14 en/lb_source_debian.1:14 #: en/lb_source_disk.1:14 en/lb_source_iso.1:14 en/lb_source_net.1:14 @@ -298,7 +298,7 @@ msgstr "" #: en/lb_chroot_preseed.1:17 en/lb_chroot_proc.1:17 en/lb_chroot_resolv.1:17 #: en/lb_chroot_selinuxfs.1:17 en/lb_chroot_sysfs.1:17 #: en/lb_chroot_sysv-rc.1:17 en/lb_chroot_task-lists.1:17 -#: en/lb_chroot_upstart.1:17 en/lb_clean.1:38 en/lb_config.1:494 +#: en/lb_chroot_upstart.1:17 en/lb_clean.1:38 en/lb_config.1:498 #: en/lb_local.1:17 en/lb_source.1:17 en/lb_source_checksums.1:17 #: en/lb_source_debian-live.1:17 en/lb_source_debian.1:17 #: en/lb_source_disk.1:17 en/lb_source_iso.1:17 en/lb_source_net.1:17 @@ -332,7 +332,7 @@ msgstr "" #: en/lb_chroot_preseed.1:21 en/lb_chroot_proc.1:21 en/lb_chroot_resolv.1:21 #: en/lb_chroot_selinuxfs.1:21 en/lb_chroot_sysfs.1:21 #: en/lb_chroot_sysv-rc.1:21 en/lb_chroot_task-lists.1:21 -#: en/lb_chroot_upstart.1:21 en/lb_clean.1:43 en/lb_config.1:501 +#: en/lb_chroot_upstart.1:21 en/lb_clean.1:43 en/lb_config.1:505 #: en/lb_local.1:20 en/lb_source.1:20 en/lb_source_checksums.1:21 #: en/lb_source_debian-live.1:21 en/lb_source_debian.1:21 #: en/lb_source_disk.1:21 en/lb_source_iso.1:21 en/lb_source_net.1:21 @@ -366,7 +366,7 @@ msgstr "" #: en/lb_chroot_preseed.1:23 en/lb_chroot_proc.1:23 en/lb_chroot_resolv.1:23 #: en/lb_chroot_selinuxfs.1:23 en/lb_chroot_sysfs.1:23 #: en/lb_chroot_sysv-rc.1:23 en/lb_chroot_task-lists.1:23 -#: en/lb_chroot_upstart.1:23 en/lb_clean.1:45 en/lb_config.1:503 +#: en/lb_chroot_upstart.1:23 en/lb_clean.1:45 en/lb_config.1:507 #: en/lb_local.1:22 en/lb_source.1:22 en/lb_source_checksums.1:23 #: en/lb_source_debian-live.1:23 en/lb_source_debian.1:23 #: en/lb_source_disk.1:23 en/lb_source_iso.1:23 en/lb_source_net.1:23 @@ -399,7 +399,7 @@ msgstr "" #: en/lb_chroot_preseed.1:25 en/lb_chroot_proc.1:25 en/lb_chroot_resolv.1:25 #: en/lb_chroot_selinuxfs.1:25 en/lb_chroot_sysfs.1:25 #: en/lb_chroot_sysv-rc.1:25 en/lb_chroot_task-lists.1:25 -#: en/lb_chroot_upstart.1:25 en/lb_clean.1:47 en/lb_config.1:509 +#: en/lb_chroot_upstart.1:25 en/lb_clean.1:47 en/lb_config.1:513 #: en/lb_local.1:24 en/lb_source.1:24 en/lb_source_checksums.1:25 #: en/lb_source_debian-live.1:25 en/lb_source_debian.1:25 #: en/lb_source_disk.1:25 en/lb_source_iso.1:25 en/lb_source_net.1:25 @@ -432,7 +432,7 @@ msgstr "" #: en/lb_chroot_preseed.1:26 en/lb_chroot_proc.1:26 en/lb_chroot_resolv.1:26 #: en/lb_chroot_selinuxfs.1:26 en/lb_chroot_sysfs.1:26 #: en/lb_chroot_sysv-rc.1:26 en/lb_chroot_task-lists.1:26 -#: en/lb_chroot_upstart.1:26 en/lb_clean.1:48 en/lb_config.1:510 +#: en/lb_chroot_upstart.1:26 en/lb_clean.1:48 en/lb_config.1:514 #: en/lb_local.1:25 en/lb_source.1:25 en/lb_source_checksums.1:26 #: en/lb_source_debian-live.1:26 en/lb_source_debian.1:26 #: en/lb_source_disk.1:26 en/lb_source_iso.1:26 en/lb_source_net.1:26 @@ -466,7 +466,7 @@ msgstr "" #: en/lb_chroot_preseed.1:28 en/lb_chroot_proc.1:28 en/lb_chroot_resolv.1:28 #: en/lb_chroot_selinuxfs.1:28 en/lb_chroot_sysfs.1:28 #: en/lb_chroot_sysv-rc.1:28 en/lb_chroot_task-lists.1:28 -#: en/lb_chroot_upstart.1:28 en/lb_clean.1:50 en/lb_config.1:512 +#: en/lb_chroot_upstart.1:28 en/lb_clean.1:50 en/lb_config.1:516 #: en/lb_local.1:27 en/lb_source.1:27 en/lb_source_checksums.1:28 #: en/lb_source_debian-live.1:28 en/lb_source_debian.1:28 #: en/lb_source_disk.1:28 en/lb_source_iso.1:28 en/lb_source_net.1:28 @@ -502,7 +502,7 @@ msgstr "" #: en/lb_chroot_preseed.1:29 en/lb_chroot_proc.1:29 en/lb_chroot_resolv.1:29 #: en/lb_chroot_selinuxfs.1:29 en/lb_chroot_sysfs.1:29 #: en/lb_chroot_sysv-rc.1:29 en/lb_chroot_task-lists.1:29 -#: en/lb_chroot_upstart.1:29 en/lb_clean.1:51 en/lb_config.1:513 +#: en/lb_chroot_upstart.1:29 en/lb_clean.1:51 en/lb_config.1:517 #: en/lb_local.1:28 en/lb_source.1:28 en/lb_source_checksums.1:29 #: en/lb_source_debian-live.1:29 en/lb_source_debian.1:29 #: en/lb_source_disk.1:29 en/lb_source_iso.1:29 en/lb_source_net.1:29 @@ -536,7 +536,7 @@ msgstr "" #: en/lb_chroot_preseed.1:31 en/lb_chroot_proc.1:31 en/lb_chroot_resolv.1:31 #: en/lb_chroot_selinuxfs.1:31 en/lb_chroot_sysfs.1:31 #: en/lb_chroot_sysv-rc.1:31 en/lb_chroot_task-lists.1:31 -#: en/lb_chroot_upstart.1:31 en/lb_clean.1:53 en/lb_config.1:515 +#: en/lb_chroot_upstart.1:31 en/lb_clean.1:53 en/lb_config.1:519 #: en/lb_local.1:30 en/lb_source.1:30 en/lb_source_checksums.1:31 #: en/lb_source_debian-live.1:31 en/lb_source_debian.1:31 #: en/lb_source_disk.1:31 en/lb_source_iso.1:31 en/lb_source_net.1:31 @@ -573,7 +573,7 @@ msgstr "" #: en/lb_chroot_preseed.1:32 en/lb_chroot_proc.1:32 en/lb_chroot_resolv.1:32 #: en/lb_chroot_selinuxfs.1:32 en/lb_chroot_sysfs.1:32 #: en/lb_chroot_sysv-rc.1:32 en/lb_chroot_task-lists.1:32 -#: en/lb_chroot_upstart.1:32 en/lb_clean.1:54 en/lb_config.1:516 +#: en/lb_chroot_upstart.1:32 en/lb_clean.1:54 en/lb_config.1:520 #: en/lb_local.1:31 en/lb_source.1:31 en/lb_source_checksums.1:32 #: en/lb_source_debian-live.1:32 en/lb_source_debian.1:32 #: en/lb_source_disk.1:32 en/lb_source_iso.1:32 en/lb_source_net.1:32 @@ -607,7 +607,7 @@ msgstr "" #: en/lb_chroot_preseed.1:33 en/lb_chroot_proc.1:33 en/lb_chroot_resolv.1:33 #: en/lb_chroot_selinuxfs.1:33 en/lb_chroot_sysfs.1:33 #: en/lb_chroot_sysv-rc.1:33 en/lb_chroot_task-lists.1:33 -#: en/lb_chroot_upstart.1:33 en/lb_clean.1:55 en/lb_config.1:517 +#: en/lb_chroot_upstart.1:33 en/lb_clean.1:55 en/lb_config.1:521 #: en/lb_local.1:32 en/lb_source.1:32 en/lb_source_checksums.1:33 #: en/lb_source_debian-live.1:33 en/lb_source_debian.1:33 #: en/lb_source_disk.1:33 en/lb_source_iso.1:33 en/lb_source_net.1:33 @@ -681,528 +681,533 @@ msgstr "" #. type: Plain text #: en/lb_config.1:31 -msgid " [-a|B<--architectures> I]" +msgid " [B<--apt-source> true|false]" msgstr "" #. type: Plain text #: en/lb_config.1:33 -msgid " [-b|B<--binary-images> iso|iso-hybrid|net|tar|usb-hdd|virtual-hdd]" +msgid " [-a|B<--architectures> I]" msgstr "" #. type: Plain text #: en/lb_config.1:35 -msgid " [B<--binary-filesystem> fat16|fat32|ext2]" +msgid " [-b|B<--binary-images> iso|iso-hybrid|net|tar|usb-hdd|virtual-hdd]" msgstr "" #. type: Plain text #: en/lb_config.1:37 -msgid " [B<--bootappend-install> I|I<\"PARAMETERS\">]" +msgid " [B<--binary-filesystem> fat16|fat32|ext2]" msgstr "" #. type: Plain text #: en/lb_config.1:39 -msgid " [B<--bootappend-live> I|I<\"PARAMETERS\">]" +msgid " [B<--bootappend-install> I|I<\"PARAMETERS\">]" msgstr "" #. type: Plain text #: en/lb_config.1:41 -msgid " [B<--bootloader> grub|syslinux|yaboot]" +msgid " [B<--bootappend-live> I|I<\"PARAMETERS\">]" msgstr "" #. type: Plain text #: en/lb_config.1:43 -msgid " [B<--bootstrap> cdebootstrap|cdebootstrap-static|debootstrap|copy]" +msgid " [B<--bootloader> grub|syslinux|yaboot]" msgstr "" #. type: Plain text #: en/lb_config.1:45 -msgid " [-f|B<--bootstrap-flavour> minimal|standard]" +msgid " [B<--bootstrap> cdebootstrap|cdebootstrap-static|debootstrap|copy]" msgstr "" #. type: Plain text #: en/lb_config.1:47 -msgid " [B<--bootstrap-keyring> I]" +msgid " [-f|B<--bootstrap-flavour> minimal|standard]" msgstr "" #. type: Plain text #: en/lb_config.1:49 -msgid " [B<--cache> true|false]" +msgid " [B<--bootstrap-keyring> I]" msgstr "" #. type: Plain text #: en/lb_config.1:51 -msgid " [B<--cache-indices> true|false]" +msgid " [B<--cache> true|false]" msgstr "" #. type: Plain text #: en/lb_config.1:53 -msgid " [B<--cache-packages> true|false]" +msgid " [B<--cache-indices> true|false]" msgstr "" #. type: Plain text #: en/lb_config.1:55 -msgid " [B<--cache-stages> I|I<\"STAGES\">]" +msgid " [B<--cache-packages> true|false]" msgstr "" #. type: Plain text #: en/lb_config.1:57 -msgid " [B<--checksums> md5|sha1|sha256|none]" +msgid " [B<--cache-stages> I|I<\"STAGES\">]" msgstr "" #. type: Plain text #: en/lb_config.1:59 -msgid " [B<--compression> bzip2|gzip|lzip|none]" +msgid " [B<--checksums> md5|sha1|sha256|none]" msgstr "" #. type: Plain text #: en/lb_config.1:61 -msgid " [B<--build-with-chroot> true|false]" +msgid " [B<--compression> bzip2|gzip|lzip|none]" msgstr "" #. type: Plain text #: en/lb_config.1:63 -msgid " [B<--chroot-filesystem> ext2|ext3|squashfs|plain|jffs2]" +msgid " [B<--build-with-chroot> true|false]" msgstr "" #. type: Plain text #: en/lb_config.1:65 -msgid " [B<--clean>]" +msgid " [B<--chroot-filesystem> ext2|ext3|squashfs|plain|jffs2]" msgstr "" #. type: Plain text #: en/lb_config.1:67 -msgid " [-c|B<--conffile> I]" +msgid " [B<--clean>]" msgstr "" #. type: Plain text #: en/lb_config.1:69 -msgid " [B<--debconf-frontend> dialog|editor|noninteractive|readline]" +msgid " [-c|B<--conffile> I]" msgstr "" #. type: Plain text #: en/lb_config.1:71 -msgid " [B<--debconf-nowarnings> true|false]" +msgid " [B<--debconf-frontend> dialog|editor|noninteractive|readline]" msgstr "" #. type: Plain text #: en/lb_config.1:73 -msgid " [B<--debconf-priority> low|medium|high|critical]" +msgid " [B<--debconf-nowarnings> true|false]" msgstr "" #. type: Plain text #: en/lb_config.1:75 +msgid " [B<--debconf-priority> low|medium|high|critical]" +msgstr "" + +#. type: Plain text +#: en/lb_config.1:77 msgid "" " [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:77 +#: en/lb_config.1:79 msgid " [B<--debian-installer-distribution> daily|I]" msgstr "" #. type: Plain text -#: en/lb_config.1:79 +#: en/lb_config.1:81 msgid " [B<--debian-installer-preseedfile> I|I]" msgstr "" #. type: Plain text -#: en/lb_config.1:81 +#: en/lb_config.1:83 msgid " [B<--debian-installer-gui> true|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:83 +#: en/lb_config.1:85 msgid " [B<--debug>]" msgstr "" #. type: Plain text -#: en/lb_config.1:85 +#: en/lb_config.1:87 msgid " [-d|B<--distribution> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:87 +#: en/lb_config.1:89 msgid " [B<--parent-distribution> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:89 +#: en/lb_config.1:91 msgid " [B<--parent-debian-installer-distribution> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:91 +#: en/lb_config.1:93 msgid " [B<--dump>]" msgstr "" #. type: Plain text -#: en/lb_config.1:93 +#: en/lb_config.1:95 msgid " [B<--fdisk> fdisk|fdisk.dist]" msgstr "" #. type: Plain text -#: en/lb_config.1:95 +#: en/lb_config.1:97 msgid " [B<--force>]" msgstr "" #. type: Plain text -#: en/lb_config.1:97 +#: en/lb_config.1:99 msgid " [B<--grub-splash> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:99 +#: en/lb_config.1:101 msgid " [B<--gzip-options> I