From 3bad58702fb8351205853cc5ec7bf075c026cc95 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 6 Sep 2011 15:25:52 +0200
Subject: [PATCH] Import patches-unapplied version 2.36 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: 99d9759e40c30685af6759cae6e5d9bbed8cc6f7

New changelog entries:
  [ Colin Watson ]
  * BuildLiveCD: Add subproject and ubuntu-defaults-image locale to error
    mail subject.
  * BuildLiveCD: Install recommendations of ubuntu-defaults-builder.
  [ Oliver Grawert ]
  * also store the size of the ac100 tarball in the initrd, since the tarball
    changes its name several times during build we need a second criteria to not
    loop over all availiable tarballs with md5sum at install time.
---
 BuildLiveCD           |  5 +++--
 debian/changelog      | 14 ++++++++++++++
 live-build/auto/build |  3 ++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/BuildLiveCD b/BuildLiveCD
index ce543ccb..5ca05659 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -14,7 +14,7 @@ finish() {
     fi
     if [ "$SEND_LOG" = "yes" ]; then
         exec >/dev/null 2>&1
-        mailx -s "LiveCD: $STATUS $STE:$FS${SUBARCH:+-$SUBARCH} build on ${ARCH}" buildd+porters < "$BUILD_LOG"
+        mailx -s "LiveCD: $STATUS $STE:$FS${SUBPROJECT:+-$SUBPROJECT}${SUBARCH:+-$SUBARCH}${UBUNTU_DEFAULTS_LOCALE:+-$UBUNTU_DEFAULTS_LOCALE} build on ${ARCH}" buildd+porters < "$BUILD_LOG"
     fi
     rm -f ~/buildLiveCD.lock
     nohup ~/bin/pruneLiveCD >/dev/null 2>&1 &
@@ -114,7 +114,8 @@ for STE in $SUITES; do
     if [ -d ~/build-${STE}-live/chroot-${STE} ]; then
 	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -qq update || true
 	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y dist-upgrade || true
-	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs ubuntu-defaults-builder || true
+	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs || true
+	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y --install-recommends ubuntu-defaults-builder || true
     fi
 done
 for STE in $SUITES; do
diff --git a/debian/changelog b/debian/changelog
index b5ee56d6..e2c4d9fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+livecd-rootfs (2.36) oneiric; urgency=low
+
+  [ Colin Watson ]
+  * BuildLiveCD: Add subproject and ubuntu-defaults-image locale to error
+    mail subject.
+  * BuildLiveCD: Install recommendations of ubuntu-defaults-builder.
+
+  [ Oliver Grawert ]
+  * also store the size of the ac100 tarball in the initrd, since the tarball 
+    changes its name several times during build we need a second criteria to not
+    loop over all availiable tarballs with md5sum at install time.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 06 Sep 2011 15:25:52 +0200
+
 livecd-rootfs (2.35) oneiric; urgency=low
 
   * Set KERNEL_FLAVOURS for mx5.
diff --git a/live-build/auto/build b/live-build/auto/build
index 061f979a..fd95b4b2 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -184,8 +184,9 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
 fi
 
 if [ "$SUBARCH" = "ac100" ]; then
-	# create the md5sum file for which we are actually doing all this
+	# create the md5sum and size files for which we are actually doing all this
 	md5sum $PREFIX.rootfs.tar.gz >chroot/installer.md5
+	wc -c $PREFIX.rootfs.tar.gz >chroot/installer.size
 
 	# make sure update-initramfs feels cosy and warm in the environment
 	lb chroot_proc install "$@"