From 6ff0b8e618090ab86cd14cfa6c097aa689fe44e9 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Thu, 11 Jul 2013 16:41:25 +0200
Subject: [PATCH] fix buildstamp creation for ubuntu-touch

---
 BuildLiveCD            | 4 +---
 debian/changelog       | 7 +++++++
 live-build/auto/config | 3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/BuildLiveCD b/BuildLiveCD
index 2a5c1016..925d8f43 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -128,8 +128,6 @@ for STE in $SUITES; do
 	typeset -i n=1; while [ -d ${PUBDIR}${NOW}.$n ]; do n=n+1; done
 	NOW=${NOW}.$n
     fi
-    NOW=${NOW}
-    export NOW
     LOG=${PUBDIR}${NOW}/livecd-${NOW}-${ARCH}.out
 
     rm -f ${PUBDIR}latest
@@ -140,7 +138,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} PROPOSED=${PROPOSED:+1} lb config" >> ${LOG} 2>&1; then
+	if ! $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && NOW=${NOW} 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"
diff --git a/debian/changelog b/debian/changelog
index 242dc324..33017366 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.156) UNRELEASED; urgency=low
+
+  * fix build stamp handling for ubuntu-touch (requires an RT to have IS
+    update BuildLiveCD on the builders)
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 11 Jul 2013 16:34:34 +0200
+
 livecd-rootfs (2.155) saucy; urgency=low
 
   * try to hand the exported $NOW over from live-build/auto/config as
diff --git a/live-build/auto/config b/live-build/auto/config
index 0d676af7..ed285942 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -89,8 +89,6 @@ PREINSTALL_POOL_SEEDS=
 CHROOT_HOOKS=
 BINARY_HOOKS=
 
-BUILDSTAMP="${NOW}"
-
 add_chroot_hook ()
 {
 	CHROOT_HOOKS="${CHROOT_HOOKS:+$CHROOT_HOOKS }$1"
@@ -399,6 +397,7 @@ lb config noauto \
 
 echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
 echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
+echo "BUILDSTAMP=\"$NOW\"" >> config/binary
 
 case $PROJECT in
 	ubuntu-server)