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

[Łukasz Zemczak]

Add support for raspi3 rootfs generation for ubuntu-image consumption with all the additional changes required.

Add support for raspi3 rootfs generation for ubuntu-image consumption with all the additional changes required.

This is based on https://code.launchpad.net/~fo0bar/livecd-rootfs/raspi2-rpi3/+merge/293959 but with only the rootfs bits.

It depends on the dangling-vmlinuz branch.

The additional change for copying the initrd and kernel into image/boot/uboot is to keep 'feature parity' with what snap prepare does when generating the rootfs.

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

1672. By Łukasz Zemczak on 2018-10-30

Merge latest prerequisite branch

[Steve Langasek (vorlon)]

review: Needs Information

[Łukasz Zemczak (sil2100)]

Thanks for the review Steve! So the reason why I added raspi3 even to the deprecated bits was for (possibly unneeded) consistency. As for the duplicated code, this comes from Ryan's original MP but I left it in case I needed to tweak some parts specifically for the pi3. Nothing like that ended up being necessary, so I'll merge those into one thing then.

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

1673. By Łukasz Zemczak on 2018-10-31

Merge latest prerequisite branch

1674. By Łukasz Zemczak on 2018-10-31

Remove unneeded code and code duplication, add comments.

[Steve Langasek (vorlon)]

review: Needs Fixing

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

1675. By Łukasz Zemczak on 2018-11-02

Remove more unneeded raspi3 conditionals.

=== modified file 'debian/changelog'
--- debian/changelog	2018-10-30 14:11:49 +0000
+++ debian/changelog	2018-11-02 08:27:17 +0000
@@ -10,6 +10,9 @@
   [ Łukasz 'sil2100' Zemczak ]
   * Avoid issues of hard-linking to a symbolic vmlinuz as this can lead to a
     dangling symlink.
+  * 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*.
 
  -- Łukasz 'sil2100' Zemczak <[e-mail]>  Tue, 18 Sep 2018 10:21:30 +0200
 

=== modified file 'live-build/auto/build'
--- live-build/auto/build	2018-10-31 10:17:01 +0000
+++ live-build/auto/build	2018-11-02 08:27:17 +0000
@@ -863,36 +863,52 @@
 	fi
 fi
 
-if [ "$SUBARCH" = "ac100" ]; then
-	# 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
-
-	INFO_DESC="$(lsb_release -d -s)"
-	INFO_STAMP=$(date +20%y%m%d-%H:%M)
-
-	echo "$INFO_DESC - $ARCH ($INFO_STAMP)" >chroot/media-info
-
-	# make sure update-initramfs feels cosy and warm in the environment
-	lb chroot_proc install "$@"
-	lb chroot_sysfs install "$@"
-	lb chroot_devpts install "$@"
-
-	# re-create initrd to contain the installer.md5 file
-	Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k all -t -u -v"
-
-	# create boot.img
-	Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg-$SUBARCH -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}"
-
-	# clean up
-	lb chroot_devpts remove "$@"
-	lb chroot_sysfs remove "$@"
-	lb chroot_proc remove "$@"
-
-	cp "chroot/boot/installer-${KVERS}.img" "$PREFIX.bootimg-$FLAVOUR"
-	ln -sf "$PREFIX.bootimg-$FLAVOUR" "$PREFIX.bootimg"
-
-fi
+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
+	
+		INFO_DESC="$(lsb_release -d -s)"
+		INFO_STAMP=$(date +20%y%m%d-%H:%M)
+	
+		echo "$INFO_DESC - $ARCH ($INFO_STAMP)" >chroot/media-info
+	
+		# make sure update-initramfs feels cosy and warm in the environment
+		lb chroot_proc install "$@"
+		lb chroot_sysfs install "$@"
+		lb chroot_devpts install "$@"
+	
+		# re-create initrd to contain the installer.md5 file
+		Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k all -t -u -v"
+	
+		# create boot.img
+		Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg-$SUBARCH -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}"
+	
+		# clean up
+		lb chroot_devpts remove "$@"
+		lb chroot_sysfs remove "$@"
+		lb chroot_proc remove "$@"
+	
+		cp "chroot/boot/installer-${KVERS}.img" "$PREFIX.bootimg-$FLAVOUR"
+		ln -sf "$PREFIX.bootimg-$FLAVOUR" "$PREFIX.bootimg"
+		;;
+
+	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"

=== modified file 'live-build/auto/config'
--- live-build/auto/config	2018-10-22 17:21:50 +0000
+++ live-build/auto/config	2018-11-02 08:27:17 +0000
@@ -801,7 +801,7 @@
 				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