From 22acc1e6029f480360f633265b86a59768ed7991 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Thu, 11 Apr 2013 11:28:08 +0200 Subject: [PATCH] Import patches-unapplied version 2.119 to ubuntu/raring-proposed Imported using git-ubuntu import. Changelog parent: 1812c4e20f222fd2ca6b7a4b86ff7a5657a5af22 New changelog entries: [ Colin Watson ] * BuildLiveCD: Link livecd-${NOW}-${ARCH}.out to livecd-${ARCH}.out, to make it easier for cdimage to fetch the latest build log for failure notification mails. [ Oliver Grawert ] * the android build system is sadly full of bashisms (even though it has generic .sh suffixes and no shebang line) until this is fixed use a /bin/bash shebang --- BuildLiveCD | 1 + debian/changelog | 14 ++++++++++++++ ubuntu-touch-android.sh | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/BuildLiveCD b/BuildLiveCD index 2f3063db..508e56a6 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -134,6 +134,7 @@ for STE in $SUITES; do ln -sf ${PUBDIR}${NOW} ${PUBDIR}latest mkdir -p ${PUBDIR}${NOW} > ${LOG} + ln -sf livecd-${NOW}-${ARCH}.out ${PUBDIR}${NOW}/livecd-${ARCH}.out 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 diff --git a/debian/changelog b/debian/changelog index 2588c178..ac460972 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +livecd-rootfs (2.119) raring; urgency=low + + [ Colin Watson ] + * BuildLiveCD: Link livecd-${NOW}-${ARCH}.out to livecd-${ARCH}.out, to + make it easier for cdimage to fetch the latest build log for failure + notification mails. + + [ Oliver Grawert ] + * the android build system is sadly full of bashisms (even though it has + generic .sh suffixes and no shebang line) until this is fixed use a + /bin/bash shebang + + -- Oliver Grawert Thu, 11 Apr 2013 11:28:08 +0200 + livecd-rootfs (2.118) raring; urgency=low * normalize the naming scheme for ubuntu-touch-android.sh output diff --git a/ubuntu-touch-android.sh b/ubuntu-touch-android.sh index c845910d..ab8cbcfa 100755 --- a/ubuntu-touch-android.sh +++ b/ubuntu-touch-android.sh @@ -1,4 +1,4 @@ -!#/bin/sh +!#/bin/bash set -e