[SCM] live-build branch, debian-next, updated. debian/3.0_a25-1-45-gcba1c05
Daniel Baumann
daniel at debian.org
Fri Jul 29 09:29:03 UTC 2011
The following commit has been merged in the debian-next branch:
commit cba1c05b33f72a9fda77fc634249374b919736df
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Jul 29 11:30:53 2011 +0200
Handle package-lists parameter for lb_config in live-build-cron-images script for both lb version 2.x and 3.x.
diff --git a/cron/live-build-cron-images b/cron/live-build-cron-images
index ed709a2..b55c6ef 100755
--- a/cron/live-build-cron-images
+++ b/cron/live-build-cron-images
@@ -167,6 +167,18 @@ Build ()
rm -rf cache/stages_rootfs
rm -f config/* || true
+ LB_VERSION="$(lb --version | awk '/^live-build, version / { print $3 }')"
+
+ case "${LB_VERSION}" in
+ 2.0*)
+ _PACKAGE_LISTS="--packages-lists ${FLAVOUR}"
+ ;;
+
+ 3.0*)
+ _PACKAGE_LISTS="--package-lists ${FLAVOUR}"
+ ;;
+ esac
+
# FIXME: cdebootstrap
lb config --clean \
--bootstrap cdebootstrap \
@@ -177,7 +189,7 @@ Build ()
--mirror-bootstrap ${MIRROR_BOOTSTRAP} \
--mirror-chroot ${MIRROR_CHROOT} \
--mirror-chroot-security ${MIRROR_CHROOT_SECURITY} \
- --packages-lists ${FLAVOUR}
+ ${_PACKAGE_LISTS}
lb build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.log
--
live-build
More information about the debian-live-changes
mailing list