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

Imported using git-ubuntu import.

Changelog parent: ff441d12fb

New changelog entries:
  * add nexus7 specific kernel cmdline
  * move the nexus7 processing up a bit in the code so we can modify the
    bootimg cmdline before the file gets copied around

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.96) raring; urgency=low
+
+  * add nexus7 specific kernel cmdline
+  * move the nexus7 processing up a bit in the code so we can modify the
+    bootimg cmdline before the file gets copied around
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 14 Nov 2012 13:28:50 +0100
+
 livecd-rootfs (2.95) raring; urgency=low
 
   * make the dependency on android-tools-fsutils not arch specific, seems

live-build/auto/build

@@ -376,6 +376,17 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
 	# create boot.img
 	Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}"
 
+	if [ "$SUBARCH" = "nexus7" ]; then
+		# adjust the bootimg cmdline parameters
+		Chroot chroot 'abootimg -u /boot/installer-${KVERS}.img -c "cmdline=root=/dev/mmcblk0p9 ro console=tty1 fbcon=rotate:1 quiet splash"'
+
+		# 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
+
 	# clean up
 	lb chroot_devpts remove "$@"
 	lb chroot_sysfs remove "$@"
@@ -384,13 +395,6 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; 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))