[SCM] live-build branch, debian-next, updated. debian/2.0_a28-1-5-g35c11b4
Daniel Baumann
daniel at debian.org
Thu Sep 16 12:18:09 UTC 2010
The following commit has been merged in the debian-next branch:
commit 35c11b4aac545217e3318f218b416929c6b19f14
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 16 14:15:30 2010 +0200
Adding support for inclusion of the debian-backports repository.
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 193d59b..01e7aba 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -359,6 +359,22 @@ Set_defaults ()
LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-none}"
fi
+ # Setting backports mirror to fetch packages from
+ if [ -z "${LB_MIRROR_CHROOT_BACKPORTS}" ]
+ 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
+ ;;
+ esac
+
+ LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-none}"
+ fi
+
# Setting mirror which ends up in the image
if [ -z "${LB_MIRROR_BINARY}" ]
then
@@ -439,6 +455,22 @@ Set_defaults ()
LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY_VOLATILE:-none}"
fi
+ # Setting backports mirror which ends up in the image
+ if [ -z "${LB_MIRROR_BINARY_BACKPORTS}" ]
+ 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
+ ;;
+ esac
+
+ LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-none}"
+ fi
+
LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_BOOTSTRAP}}"
# Setting archive areas value
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index 6c95967..d5dfeea 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -110,6 +110,23 @@ EOF
esac
fi
+ if [ "${LB_BACKPORTS}" = "true" ]
+ then
+ case "${LB_MODE}" in
+ debian|debian-release)
+ if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ]
+ then
+ echo "deb ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ fi
+ fi
+ ;;
+ esac
+ fi
+
# Check local sources.list
if Find_files config/chroot_sources/*.chroot
then
@@ -507,6 +524,23 @@ EOF
esac
fi
+ if [ "${LB_BACKPORTS}" = "true" ]
+ then
+ case "${LB_MODE}" in
+ debian|debian-release)
+ if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ]
+ then
+ echo "deb ${LB_MIRROR_BINARY_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_MIRROR_BINARY_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ fi
+ fi
+ ;;
+ esac
+ fi
+
# Configure third-party repositories
if [ -n "${LB_REPOSITORIES}" ]
then
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index a6007cc..05bb60c 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -95,9 +95,11 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--mirror-chroot URL]\n\
\t [--mirror-chroot-security URL]\n\
\t [--mirror-chroot-volatile URL]\n\
+\t [--mirror-chroot-backports URL]\n\
\t [--mirror-binary URL]\n\
\t [--mirror-binary-security URL]\n\
\t [--mirror-binary-volatile URL]\n\
+\t [--mirror-binary-backports URL]\n\
\t [--mirror-debian-installer URL]\n\
\t [--mode debian|emdebian]\n\
\t [--net-root-filesystem nfs|cfs]\n\
@@ -129,6 +131,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--templates PATH]\n\
\t [--virtual-root-size MB]\n\
\t [--volatile true|false]\n\
+\t [--backports true|false]\n\
\t [--exposed-root true|false]\n\
\t [--username NAME]\n\
\t [--verbose]\n\
@@ -141,10 +144,10 @@ Local_arguments ()
cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
initramfs:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:,
templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
- distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-binary:,
- mirror-binary-security:,mirror-binary-volatile:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
+ distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:,
+ mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
- packages:,packages-lists:,tasks:,security:,volatile:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
+ packages:,packages-lists:,tasks:,security:,volatile:,backports:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,build-with-chroot:,
debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
encryption:,grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:,
@@ -403,6 +406,11 @@ Local_arguments ()
shift 2
;;
+ --mirror-chroot-backports)
+ LB_MIRROR_CHROOT_BACKPORTS="${2}"
+ shift 2
+ ;;
+
--mirror-binary)
LB_MIRROR_BINARY="${2}"
shift 2
@@ -418,6 +426,11 @@ Local_arguments ()
shift 2
;;
+ --mirror-binary-backports)
+ LB_MIRROR_BINARY_BACKPORTS="${2}"
+ shift 2
+ ;;
+
--mirror-debian-installer)
LB_MIRROR_DEBIAN_INSTALLER="${2}"
shift 2
@@ -504,6 +517,11 @@ Local_arguments ()
shift 2
;;
+ --backports)
+ LB_BACKPORTS="${2}"
+ shift 2
+ ;;
+
--symlinks)
LB_SYMLINKS="${2}"
shift 2
@@ -994,6 +1012,10 @@ LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY}"
# (Default: ${LB_MIRROR_CHROOT_VOLATILE})
LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE}"
+# \$LB_MIRROR_CHROOT_BACKPORTS: set backports mirror to fetch packages from
+# (Default: ${LB_MIRROR_CHROOT_BACKPORTS})
+LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS}"
+
# \$LB_MIRROR_BINARY: set mirror which ends up in the image
# (Default: ${LB_MIRROR_BINARY})
LB_MIRROR_BINARY="${LB_MIRROR_BINARY}"
@@ -1006,6 +1028,10 @@ LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY}"
# (Default: ${LB_MIRROR_BINARY_VOLATILE})
LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY_VOLATILE}"
+# \$LB_MIRROR_BINARY_BACKPORTS: set backports mirror which ends up in the image
+# (Default: ${LB_MIRROR_BINARY_BACKPORTS})
+LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS}"
+
# \$LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
# (Default: ${LB_MIRROR_BOOTSTRAP})
LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}"
@@ -1092,6 +1118,10 @@ LB_SECURITY="${LB_SECURITY}"
# (Default: ${LB_VOLATILE})
LB_VOLATILE="${LB_VOLATILE}"
+# \$LB_BACKPORTS: enable backports updates
+# (Default: ${LB_BACKPORTS})
+LB_BACKPORTS="${LB_BACKPORTS}"
+
# \$LB_SYMLINKS: enable symlink convertion
# (Default: ${LB_SYMLINKS})
LB_SYMLINKS="${LB_SYMLINKS}"
--
live-build
More information about the debian-live-changes
mailing list