manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle package-lists parameter for lb_config in live-build-cron-images script for both lb version 2.x and 3.x.

This commit is contained in:
Daniel Baumann 2011-07-29 11:30:53 +02:00
parent b181612222
commit cba1c05b33
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cron/live-build-cron-images
View File

@ -167,6 +167,18 @@ Build ()
rm -rf cache/stages_rootfs rm -rf cache/stages_rootfs
rm -f config/* || true 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 # FIXME: cdebootstrap
lb config --clean \ lb config --clean \
--bootstrap cdebootstrap \ --bootstrap cdebootstrap \
@ -177,7 +189,7 @@ Build ()
--mirror-bootstrap ${MIRROR_BOOTSTRAP} \ --mirror-bootstrap ${MIRROR_BOOTSTRAP} \
--mirror-chroot ${MIRROR_CHROOT} \ --mirror-chroot ${MIRROR_CHROOT} \
--mirror-chroot-security ${MIRROR_CHROOT_SECURITY} \ --mirror-chroot-security ${MIRROR_CHROOT_SECURITY} \
--packages-lists ${FLAVOUR} ${_PACKAGE_LISTS}
lb build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.log lb build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.log