Import patches-unapplied version 2.94 to ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: 20f625ae79

New changelog entries:
  * add a dependency on android-tools-fsutils for armhf builds
  * add nexus7 live-build configuration
  * add nexus7 post processing with make_ext4fs for teh tarball to roll a
    proper android img file

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (2.94) raring; urgency=low
+
+  * add a dependency on android-tools-fsutils for armhf builds
+  * add nexus7 live-build configuration
+  * add nexus7 post processing with make_ext4fs for teh tarball to roll a
+    proper android img file
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 09 Nov 2012 13:00:36 +0100
+
 livecd-rootfs (2.93) quantal; urgency=low
 
   * Revert binary/$INITFS/kernel-$FLAVOUR to the unsigned kernel, and link

debian/control

@@ -8,7 +8,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
 
 Package: livecd-rootfs
 Architecture: all
-Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, germinate (>= 1.25.1), apt-utils, gnupg, live-build (>= 3.0~a55-1)
+Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, germinate (>= 1.25.1), apt-utils, gnupg, live-build (>= 3.0~a55-1), android-tools-fsutils [armhf]
 Suggests: partimage
 Breaks: ubuntu-defaults-builder (<< 0.32)
 Description: construction script for the livecd rootfs

live-build/auto/build

@@ -360,7 +360,7 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
 	fi
 fi
 
-if [ "$SUBARCH" = "ac100" ]; then
+if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
 	# 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
@@ -383,6 +383,14 @@ if [ "$SUBARCH" = "ac100" ]; then
 
 	cp "chroot/boot/installer-${KVERS}.img" "$PREFIX.bootimg-$FLAVOUR"
 	ln -sf "$PREFIX.bootimg-$FLAVOUR" "$PREFIX.bootimg"
+
+	if [ "$SUBARCH" = "nexus7" ]; then
+		# roll the android rootfs images
+		mkdir userdata
+		cp $PREFIX.rootfs.tar.gz userdata/rootfs.tar.gz
+		make_ext4fs -l 6G -s $PREFIX.img-$FLAVOUR userdata/
+		ln -sf "$PREFIX.img-$FLAVOUR" "$PREFIX.img"
+	fi
 fi
 
 # LTSP chroot building (only in 32bit and for Edubuntu (DVD))

live-build/auto/config

@@ -306,6 +306,12 @@ case $ARCH in
 				add_package live ac100-tarball-installer
 				BINARY_REMOVE_LINUX=false
 				;;
+			nexus7)
+				COMPONENTS='main restricted universe multiverse'
+				add_package install zram-config
+				add_package live ac100-tarball-installer
+				BINARY_REMOVE_LINUX=false
+				;;
 		esac
 		;;
 esac