diff --git a/BuildLiveCD b/BuildLiveCD index fe4aed11..2a5c1016 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -129,6 +129,7 @@ for STE in $SUITES; do NOW=${NOW}.$n fi NOW=${NOW} + export NOW LOG=${PUBDIR}${NOW}/livecd-${NOW}-${ARCH}.out rm -f ${PUBDIR}latest diff --git a/debian/changelog b/debian/changelog index dd4b350c..4a8a3e17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.150) UNRELEASED; urgency=low + + * export $NOW in BuildLiveCD so we have it available in live-build + * create a build stamp in /var/log/installer/media-info on Ubuntu Touch images + + -- Oliver Grawert Wed, 26 Jun 2013 11:32:31 +0200 + livecd-rootfs (2.149) saucy; urgency=low * set QT_SELECT=qt5 in touch image environment diff --git a/live-build/auto/build b/live-build/auto/build index 9a55659c..d678394f 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -235,6 +235,12 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS > chroot/etc/apt/sources.list rm chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig fi + if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then + INFO_DESC="$(lsb_release -d -s)" + + mkdir -p chroot/var/log/installer + echo "$INFO_DESC - $ARCH ($NOW)" >chroot/var/log/installer/media-info + fi echo "===== Checking size of /usr/share/doc =====" echo BEGIN docdirs