Merge lp:~daniel-thewatkins/livecd-rootfs/ext4 into lp:livecd-rootfs

[Dan Watkins]

slangasek changed us to producing a plain rootfs, because we don't use the ext4 rootfs _within_ the buildd. However, we have some external processing that does use it, so this reinstates it (though leaves the hardcoding, because that is a good idea).

[Dimitri John Ledkov (xnox)]

¯\_(ツ)_/¯

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-18 13:44:01 +0000
+++ debian/changelog	2016-02-22 14:44:24 +0000
@@ -1,3 +1,11 @@
+livecd-rootfs (2.380) UNRELEASED; urgency=medium
+
+  * Refactor ubuntu-cpc hooks to hard-code producing an 'ext4' rootfs, which
+    is used outside of the livecd-rootfs build process (specifically for EC2
+    publication).
+
+ -- Daniel Watkins <[e-mail]>  Mon, 22 Feb 2016 11:29:26 +0000
+
 livecd-rootfs (2.379) xenial; urgency=medium
 
   * add /var/lib/systemd/rfkill to pre-created dirs to use as writable

=== modified file 'live-build/auto/config'
--- live-build/auto/config	2016-02-18 00:48:55 +0000
+++ live-build/auto/config	2016-02-22 14:44:24 +0000
@@ -103,7 +103,7 @@
 
 case $PROJECT in
 	ubuntu-cpc)
-		IMAGEFORMAT=plain
+		IMAGEFORMAT=ext4
 		;;
 esac
 
@@ -117,7 +117,13 @@
 				COMPONENTS='main restricted universe multiverse'
 				;;
 			*)
-				add_package live jasper
+				case $PROJECT in
+					ubuntu-cpc)
+						;;
+					*)
+						add_package live jasper
+						;;
+				esac
 				;;
 		esac
 		;;

=== modified file 'live-build/ubuntu-cpc/hooks/030-root-tarball.binary'
--- live-build/ubuntu-cpc/hooks/030-root-tarball.binary	2016-02-10 17:30:48 +0000
+++ live-build/ubuntu-cpc/hooks/030-root-tarball.binary	2016-02-22 14:44:24 +0000
@@ -7,6 +7,9 @@
 
 . /build/config/functions
 
+mkdir binary/boot/filesystem.dir
+cp -a chroot/* binary/boot/filesystem.dir
+
 setup_mountpoint binary/boot/filesystem.dir
 
 chroot binary/boot/filesystem.dir dpkg-divert --local --rename /usr/sbin/grub-probe