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

Imported using git-ubuntu import.

Changelog parent: c7bec9b769

New changelog entries:
  [ Colin Watson ]
  * live-build/auto/build: Use slightly safer code for kernel handling just
    in case 'set -o pipefail' is ever reinstated here.
  [ Adam Conrad ]
  * Add abootimg explicitly to ac100 and nexus7 images, so it's marked
    as manually installed and apt doesn't autoremove it (LP: #1041290)
  * Remove linux-firmware-nexus7 from the install list, it gets pulled
    in automatically by linux-image-nexus7, so this is redundant.

debian/changelog

@@ -1,3 +1,17 @@
+livecd-rootfs (2.108) raring; urgency=low
+
+  [ Colin Watson ]
+  * live-build/auto/build: Use slightly safer code for kernel handling just
+    in case 'set -o pipefail' is ever reinstated here.
+
+  [ Adam Conrad ]
+  * Add abootimg explicitly to ac100 and nexus7 images, so it's marked
+    as manually installed and apt doesn't autoremove it (LP: #1041290)
+  * Remove linux-firmware-nexus7 from the install list, it gets pulled
+    in automatically by linux-image-nexus7, so this is redundant.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 29 Jan 2013 12:34:37 -0700
+
 livecd-rootfs (2.107) raring; urgency=low
 
   * Make sure the $PREFIX.kernel-$FLAVOUR.efi.signed output is

live-build/auto/build

@@ -320,7 +320,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 	if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
 		continue
 	fi
-	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | fgrep -v .efi | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
+	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
 	if [ -z "$KVERS" ]; then
 		if [ -e "binary/$INITFS/vmlinuz" ]; then
 			# already renamed by ubuntu-defaults-image

live-build/auto/config

@@ -298,13 +298,14 @@ case $ARCH in
 				;;
 			ac100)
 				COMPONENTS='main restricted universe multiverse'
-				add_package install zram-config
+				add_package install zram-config abootimg
 				add_package live ac100-tarball-installer
 				BINARY_REMOVE_LINUX=false
 				;;
 			nexus7)
 				COMPONENTS='main restricted universe multiverse'
-				add_package install zram-config linux-firmware-nexus7 nvidia-tegra3 ubuntu-defaults-nexus7
+				add_package install zram-config abootimg 
+				add_package install nvidia-tegra3 ubuntu-defaults-nexus7
 				add_package live ac100-tarball-installer
 				BINARY_REMOVE_LINUX=false
 				mkdir -p config/preseed