From 0b279f731b298b04f0f93dd33e4f07d1e3c1c09f Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Tue, 9 Feb 2016 12:22:13 -0800
Subject: [PATCH] Refactor ubuntu-cpc hooks to always produce a 'plain' rootfs
 via live-build and reuse this for the tarball, instead of lb_binary_rootfs
 creating some artifact that we ignore / throw away.

---
 debian/changelog                                   |  5 +++++
 live-build/auto/config                             | 14 +++++++-------
 .../ubuntu-cpc/hooks/030-root-tarball.binary       |  4 ----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 247cfdc2..d6dfdd37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,11 @@ livecd-rootfs (2.376ubuntu1) UNRELEASED; urgency=medium
   * Chroot to execute zipl, because it's nice.
   * Use the right loop device to install zipl onto.
 
+  [ Steve Langasek ]
+  * Refactor ubuntu-cpc hooks to always produce a 'plain' rootfs via
+    live-build and reuse this for the tarball, instead of lb_binary_rootfs
+    creating some artifact that we ignore / throw away.
+
  -- Ben Howard <ben.howard@ubuntu.com>  Sun, 07 Feb 2016 16:59:41 -0700
 
 livecd-rootfs (2.375) xenial; urgency=medium
diff --git a/live-build/auto/config b/live-build/auto/config
index 05692012..d17f32fb 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -101,6 +101,12 @@ add_binary_hook ()
 	BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1"
 }
 
+case $PROJECT in
+	ubuntu-cpc)
+		IMAGEFORMAT=plain
+		;;
+esac
+
 case $IMAGEFORMAT in
 	ext2|ext3|ext4)
 		OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
@@ -111,13 +117,7 @@ case $IMAGEFORMAT in
 				COMPONENTS='main restricted universe multiverse'
 				;;
 			*)
-				case $PROJECT in
-					ubuntu-cpc)
-						;;
-					*)
-						add_package live jasper
-						;;
-				esac
+				add_package live jasper
 				;;
 		esac
 		;;
diff --git a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary b/live-build/ubuntu-cpc/hooks/030-root-tarball.binary
index a5b1c3ad..1063fe12 100755
--- a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary
+++ b/live-build/ubuntu-cpc/hooks/030-root-tarball.binary
@@ -5,10 +5,6 @@ if [ -n "$SUBARCH" ]; then
 	exit 0
 fi
 
-mkdir binary/boot/filesystem.dir
-
-cp -a chroot/* binary/boot/filesystem.dir
-
 mount --bind /dev "binary/boot/filesystem.dir/dev"
 mount proc-live -t proc "binary/boot/filesystem.dir/proc"
 mount sysfs-live -t sysfs "binary/boot/filesystem.dir/sys"