Add missing commits.

ubuntu/precise
Evan Dandrea 14 years ago
parent 09a61a9aae
commit c9ef6812ae

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

14
debian/changelog vendored

@ -1,9 +1,21 @@
livecd-rootfs (2.10) oneiric; urgency=low
livecd-rootfs (2.12) oneiric; urgency=low
* Re-enable deb-src lines for Edubuntu (LP: #806428).
-- Colin Watson <cjwatson@ubuntu.com> Wed, 06 Jul 2011 13:25:56 +0100
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
* Initial Wubi support.
-- Evan Dandrea <ev@ubuntu.com> Mon, 04 Jul 2011 10:54:07 +0100
livecd-rootfs (2.9) oneiric; urgency=low
* Rename the ARM headless image to ubuntu-server for oneiric

@ -53,12 +53,20 @@ OPTS=
COMPONENTS=
BINARY_REMOVE_LINUX=:
SOURCE='--source false'
LIVE_TASK=
case $IMAGEFORMAT in
ext2|ext3|ext4)
OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
case $SUBPROJECT in
wubi)
add_package install lupin-support
;;
*)
add_package live jasper
;;
esac
;;
*)
add_package live lupin-casper
@ -68,48 +76,47 @@ esac
case $PROJECT in
ubuntu|ubuntu-dvd)
add_task install minimal standard ubuntu-desktop
add_task live ubuntu-live
LIVE_TASK='ubuntu-live'
;;
kubuntu|kubuntu-dvd)
add_task install minimal standard kubuntu-desktop
add_task live kubuntu-live
LIVE_TASK='kubuntu-live'
;;
kubuntu-mobile)
add_task install minimal standard kubuntu-mobile
add_task live kubuntu-mobile-live
LIVE_TASK='kubuntu-mobile-live'
COMPONENTS='main restricted universe'
;;
edubuntu|edubuntu-dvd)
add_task install minimal standard edubuntu-desktop-gnome
add_task live edubuntu-live
LIVE_TASK='edubuntu-live'
COMPONENTS='main restricted universe'
SOURCE='--source true --source-images none'
;;
xubuntu)
add_task install minimal standard xubuntu-desktop
add_package install xterm
add_task live xubuntu-live
LIVE_TASK='xubuntu-live'
COMPONENTS='main restricted universe multiverse'
;;
ubuntu-netbook)
add_task install minimal standard ubuntu-netbook
add_task live netbook-live
LIVE_TASK='netbook-live'
;;
mythbuntu)
add_task install minimal standard mythbuntu-desktop
add_task live mythbuntu-live
LIVE_TASK='mythbuntu-live'
COMPONENTS='main restricted universe multiverse'
;;
lubuntu)
add_task install minimal standard lubuntu-desktop
add_task live lubuntu-live
LIVE_TASK='lubuntu-live'
COMPONENTS='main restricted universe multiverse'
;;
@ -126,6 +133,15 @@ case $PROJECT in
exit 2
;;
esac
case $SUBPROJECT in
wubi)
;;
*)
add_task live "$LIVE_TASK"
;;
esac
case $PROJECT in
*-dvd)
add_task live "$PROJECT-live"
@ -183,6 +199,12 @@ case $PROJECT in
;;
esac
case $SUBPROJECT in
wubi)
ln -s /usr/share/live/build/examples/hooks/ubuntu_binary_build-wubildr.sh config/binary_local-hooks/
;;
esac
case $PROJECT in
*-dvd)
. config/bootstrap

Loading…
Cancel
Save