Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-10 09:33:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.11 to ubuntu/oneiric

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 8a101c356321fc152c30c5c5bc08229eea1e7efa

New changelog entries:
  * Pass SUBPROJECT to live-build.
This commit is contained in:
Evan Dandrea 2011-07-06 11:59:24 +01:00 committed by usd-importer
parent 8a101c3563
commit 597d603590
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BuildLiveCD
View File

@ -98,7 +98,8 @@ if [ "`echo $@ | wc -w`" -gt "1" ]; then
exit 0 exit 0
fi fi
FS="$1" FS="$1"
shift SUBPROJECT="$2"
shift 2
lockfile ~/buildLiveCD.lock || exit 1 lockfile ~/buildLiveCD.lock || exit 1
trap "finish" 0 trap "finish" 0
@ -138,10 +139,10 @@ for STE in $SUITES; do
if $LIVE_BUILD; then 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#*/./} && 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 $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} 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} lb config" >> ${LOG} 2>&1; then
exit 1 exit 1
fi fi
COMMAND="PROJECT=${FS} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build" COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
else else
COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}" COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
fi fi

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.11) oneiric; urgency=low
* Pass SUBPROJECT to live-build.
-- Evan Dandrea <ev@ubuntu.com> Wed, 06 Jul 2011 11:59:24 +0100
livecd-rootfs (2.10) oneiric; urgency=low livecd-rootfs (2.10) oneiric; urgency=low
* Initial Wubi support. * Initial Wubi support.