[Merge] livecd-rootfs:canary-build into livecd-rootfs:ubuntu/master

[Dan Bungert]

Review: Approve

LGTM but note the PPA and delta manifest before merge.

Diff comments:

> diff --git a/debian/changelog b/debian/changelog
> index ef831f3..2c6a597 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,9 @@
> +livecd-rootfs (2.820~ppa1) lunar; urgency=medium

Friendly reminder to not merge the ppa version

> +
> +  * Initial implementation of canary image builds for 23.04.
> +
> + -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com>  Wed, 05 Apr 2023 20:50:35 +0200
> +
>  livecd-rootfs (2.819) lunar; urgency=medium
>  
>    [ Heinrich Schuchardt ]
> diff --git a/live-build/lb_binary_layered b/live-build/lb_binary_layered
> index f31d5e2..146978d 100755
> --- a/live-build/lb_binary_layered
> +++ b/live-build/lb_binary_layered
> @@ -116,7 +116,9 @@ build_layered_squashfs () {
>  		create_manifest "chroot" "${squashfs_f_manifest}.full"
>  
>  		# Delta manifest
> -		diff -NU0 ${PWD}/livecd.${PROJECT_FULL}.$(get_parent_pass $pass).manifest.full ${squashfs_f_manifest}.full|grep -v ^@ > $squashfs_f_manifest
> +		diff -NU0 ${PWD}/livecd.${PROJECT_FULL}.$(get_parent_pass $pass).manifest.full ${squashfs_f_manifest}.full|grep -v ^@ > $squashfs_f_manifest || true

This looks like debugging stuff but I'm not opposed to inclusion of such things.  Just checking that it's intentional.  Note also the logic change of `|| true` on diff output, is that intentional?

> +		echo "Delta manifest:"
> +		cat $squashfs_f_manifest
>  
>  		squashfs_f_size="${base}.size"
>  		du -B 1 -s "overlay.${pass}/" | cut -f1 > "${squashfs_f_size}"


-- 
https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+merge/440431
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.