BuildLiveCD: If the -p option was used, pass PROPOSED=1 to 'lb config'.

ubuntu/trusty
Colin Watson 13 years ago
parent 483984e7b8
commit dd108cd397

@ -145,7 +145,7 @@ for STE in $SUITES; do
if $LIVE_BUILD; then
$LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && rm -rf auto && mkdir -p auto && for f in config build clean; do ln -s /usr/share/livecd-rootfs/live-build/auto/\$f auto/; done" >> ${LOG} 2>&1 || true
$LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && lb clean --purge" >> ${LOG} 2>&1 || true
if ! $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && SUITE=${STE} PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} IMAGEFORMAT=${IMAGEFORMAT} lb config" >> ${LOG} 2>&1; then
if ! $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && SUITE=${STE} PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} IMAGEFORMAT=${IMAGEFORMAT} PROPOSED=${PROPOSED:+1} lb config" >> ${LOG} 2>&1; then
exit 1
fi
COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"

1
debian/changelog vendored

@ -2,6 +2,7 @@ livecd-rootfs (2.68) UNRELEASED; urgency=low
* live-build/auto/config: Emit sources.list entries for -proposed if the
environment variable PROPOSED is set (LP: #1019514).
* BuildLiveCD: If the -p option was used, pass PROPOSED=1 to 'lb config'.
-- Colin Watson <cjwatson@ubuntu.com> Sat, 30 Jun 2012 07:10:04 +0100

Loading…
Cancel
Save