[SCM] live-build branch, debian, updated. debian/3.0_a30-1-31-g468a41f
Daniel Baumann
daniel at debian.org
Wed Sep 7 15:43:10 UTC 2011
The following commit has been merged in the debian branch:
commit 7dd4473d5a728d59341318c10f2c21656fa4417d
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Aug 24 23:30:22 2011 +0200
Renaming --apt-source to --apt-source-archives.
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 098fa88..3708729 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -103,11 +103,11 @@ Set_defaults ()
# Setting apt source
case "${LB_MODE}" in
progress)
- LB_APT_SOURCE="${LB_APT_SOURCE:-false}"
+ LB_APT_SOURCE_ARCHIVES="${LB_APT_SOURCE_ARCHIVES:-false}"
;;
*)
- LB_APT_SOURCE="${LB_APT_SOURCE:-true}"
+ LB_APT_SOURCE_ARCHIVES="${LB_APT_SOURCE_ARCHIVES:-true}"
;;
esac
diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 4366ed1..0e55c07 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -32,7 +32,7 @@
.br
[\fB\-\-apt\-secure\fP true|false]
.br
- [\fB\-\-apt\-source\fP true|false]
+ [\fB\-\-apt\-source\-archives\fP true|false]
.br
[\-a|\fB\-\-architectures\fP \fIARCHITECTURE\fP]
.br
@@ -307,7 +307,7 @@ 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
+.IP "\fB\-\-apt\-source\-archives\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
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 8770f9d..d6fd4fc 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -27,7 +27,7 @@
.br
[\fB\-\-apt\-secure\fR true|false]
.br
- [\fB\-\-apt\-source\fR true|false]
+ [\fB\-\-apt\-source\-archives\fR true|false]
.br
[\-a|\fB\-\-architectures\fR \fIARCHITECTURE\fR]
.br
@@ -269,7 +269,7 @@ 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
+.IP "\fB\-\-apt\-source\-archives\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.
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index 3fc1147..6bcc581 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 20:34+0300\n"
+"POT-Creation-Date: 2011-08-24 23:29+0300\n"
"PO-Revision-Date: 2011-08-16 20:48+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -681,7 +681,7 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:31
-msgid " [B<--apt-source> true|false]"
+msgid " [B<--apt-source-archives> true|false]"
msgstr ""
#. type: Plain text
@@ -1376,7 +1376,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:272
#, no-wrap
-msgid "B<--apt-source> true|false"
+msgid "B<--apt-source-archives> true|false"
msgstr ""
#. type: Plain text
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 23fda24..c32094f 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: 2011-08-24 20:34+0300\n"
+"POT-Creation-Date: 2011-08-24 23:29+0300\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"
@@ -681,7 +681,7 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:31
-msgid " [B<--apt-source> true|false]"
+msgid " [B<--apt-source-archives> true|false]"
msgstr ""
#. type: Plain text
@@ -1376,7 +1376,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:272
#, no-wrap
-msgid "B<--apt-source> true|false"
+msgid "B<--apt-source-archives> true|false"
msgstr ""
#. type: Plain text
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 59f0d9d..2b185cd 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -56,7 +56,7 @@ cat > chroot/etc/apt/sources.list << EOF
deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}
EOF
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
@@ -84,7 +84,7 @@ EOF
echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
fi
@@ -103,7 +103,7 @@ EOF
*)
echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
@@ -120,7 +120,7 @@ EOF
*)
echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
fi
@@ -131,7 +131,7 @@ EOF
then
echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
fi
@@ -142,7 +142,7 @@ EOF
ubuntu|kubuntu)
echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
@@ -156,7 +156,7 @@ EOF
debian|ubuntu|kubuntu)
echo "deb ${LB_PARENT_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
@@ -167,7 +167,7 @@ EOF
then
echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
fi
@@ -182,7 +182,7 @@ EOF
then
echo "deb ${LB_PARENT_MIRROR_CHROOT_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_CHROOT_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
@@ -194,7 +194,7 @@ EOF
then
echo "deb ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
fi
@@ -604,7 +604,7 @@ cat > chroot/etc/apt/sources.list << EOF
deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}
EOF
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
@@ -632,7 +632,7 @@ EOF
echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
fi
@@ -651,7 +651,7 @@ EOF
*)
echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
@@ -668,7 +668,7 @@ EOF
*)
echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
fi
@@ -679,7 +679,7 @@ EOF
then
echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
fi
@@ -690,7 +690,7 @@ EOF
ubuntu|kubuntu)
echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
@@ -704,7 +704,7 @@ EOF
debian|ubuntu|kubuntu)
echo "deb ${LB_PARENT_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
@@ -715,7 +715,7 @@ EOF
then
echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
fi
@@ -730,7 +730,7 @@ EOF
then
echo "deb ${LB_PARENT_MIRROR_BINARY_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_BINARY_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
@@ -742,7 +742,7 @@ EOF
then
echo "deb ${LB_MIRROR_BINARY_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
- if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+ if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
then
echo "deb-src ${LB_MIRROR_BINARY_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
fi
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index b4d66a1..5e61c3e 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -38,7 +38,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--apt-pipeline DEPTH]\n\
\t [--apt-recommends true|false]\n\
\t [--apt-secure true|false]\n\
-\t [--apt-source true|false]\n\
+\t [--apt-source-archives true|false]\n\
\t [-a|--architectures ARCHITECTURE]\n\
\t [-b|--binary-images iso|iso-hybrid|net|tar|usb-hdd]\n\
\t [--binary-filesystem fat16|fat32|ext2]\n\
@@ -150,7 +150,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
Local_arguments ()
{
LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitute-options:,
- apt-pipeline:,apt-recommends:,apt-secure:,apt-source:,bootstrap:,cache:,cache-indices:,cache-packages:,
+ apt-pipeline:,apt-recommends:,apt-secure:,apt-source-archives:,bootstrap:,cache:,cache-indices:,cache-packages:,
cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:,
templates:,architectures:,bootstrap-flavour:,bootstrap-keyring:,clean,
@@ -271,8 +271,8 @@ Local_arguments ()
shift 2
;;
- --apt-source)
- LB_APT_SOURCE="${2}"
+ --apt-source-archives)
+ LB_APT_SOURCE_ARCHIVES="${2}"
shift 2
;;
@@ -915,9 +915,9 @@ LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS}"
# (Default: ${LB_APT_SECURE})
LB_APT_SECURE="${LB_APT_SECURE}"
-# \$LB_APT_SOURCE: set apt/aptitude source entries in sources.list
-# (Default: ${LB_APT_SOURCE})
-LB_APT_SOURCE="${LB_APT_SOURCE}"
+# \$LB_APT_SOURCE_ARCHIVES: set apt/aptitude source entries in sources.list
+# (Default: ${LB_APT_SOURCE_ARCHIVES})
+LB_APT_SOURCE_ARCHIVES="${LB_APT_SOURCE_ARCHIVES}"
# \$LB_BOOTSTRAP: set bootstrap program
# (Default: ${LB_BOOTSTRAP})
--
live-build
More information about the debian-live-changes
mailing list