Merge lp:~sil2100/livecd-rootfs/raspi3-u-i-classic

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (2.547) UNRELEASED; urgency=medium
+
+  [ Łukasz Zemczak ]
+  * Add support for raspi3 rootfs builds (based on Ryan Finnie).
+  * For ubuntu-image consumption, export the kernel and initrd to
+    image/boot/uboot for raspi*.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 19 Nov 2018 10:39:33 -0800
+
 livecd-rootfs (2.546) disco; urgency=medium
 
   * Revert "Do not mount result, on top of lowerdir, appears to fail in

live-build/auto/build

@@ -863,7 +863,8 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
 	fi
 fi
 
-if [ "$SUBARCH" = "ac100" ]; then
+case $SUBARCH in
+	ac100)
 		# 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
@@ -891,8 +892,23 @@ if [ "$SUBARCH" = "ac100" ]; then
 	
 		cp "chroot/boot/installer-${KVERS}.img" "$PREFIX.bootimg-$FLAVOUR"
 		ln -sf "$PREFIX.bootimg-$FLAVOUR" "$PREFIX.bootimg"
+		;;
 
-fi
+	raspi2|raspi3)
+		# copy the kernel and initrd to a predictable directory for
+		# ubuntu-image consumption.  In some cases, like in pi2/3
+		# u-boot, the bootloader needs to contain the kernel and initrd,
+		# so during rootfs build we copy it over to a directory that
+		# ubuntu-image looks for and shoves into the bootloader
+		# partition.
+		UBOOT_BOOT="image/boot/uboot"
+
+		mkdir -p $UBOOT_BOOT
+
+		cp $PREFIX.initrd $UBOOT_BOOT/initrd.img || true
+		cp $PREFIX.kernel $UBOOT_BOOT/vmlinuz || true
+		;;
+esac
 
 if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
 	sourceslist="chroot/etc/apt/sources.list"

live-build/auto/config

@@ -801,7 +801,7 @@ case $ARCH in
 				add_package live ac100-tarball-installer
 				BINARY_REMOVE_LINUX=false
 				;;
-			raspi2)
+			raspi2|raspi3)
 				COMPONENTS='main restricted universe multiverse'
 				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools
 				BINARY_REMOVE_LINUX=false