From dfb272307101e9b0921c6c10e56b3941ad2a14e5 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Thu, 13 Apr 2023 12:48:10 +0000 Subject: [PATCH] Imported 2.825 No reason for CPC update specified. --- debian/changelog | 14 ++++++++++++++ live-build/auto/config | 12 +++++++++--- .../ubuntu/hooks/020-canary-enhanced-sb.binary | 2 +- live-build/ubuntu/hooks/020-canary-live.binary | 2 +- .../ubuntu/hooks/020-canary-live.chroot_early | 2 +- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 92eb2d53..fc8de620 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +livecd-rootfs (2.825) lunar; urgency=medium + + * For canary images, actually consider moving the seed listed snaps from + both minimal and standard layers to the classic layer. + + -- Łukasz 'sil2100' Zemczak Thu, 13 Apr 2023 11:46:37 +0200 + +livecd-rootfs (2.824) lunar; urgency=medium + + * Fix build failures of desktop raspi images due to canary hooks + interfering. + + -- Łukasz 'sil2100' Zemczak Thu, 13 Apr 2023 09:43:58 +0200 + livecd-rootfs (2.823) lunar; urgency=medium * Update infinite_scream URL to mastodon diff --git a/live-build/auto/config b/live-build/auto/config index 483beeff..46ba25fd 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -745,10 +745,16 @@ case $PROJECT in add_package minimal cloud-init # the standard layer, contains all base common packages for later layers (we're splitting out the snaps) add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages - # the classic layer, basically only contains snaps from the standard tasks + # the classic layer, basically only contains snaps from the standard and minimal tasks add_pass minimal.standard.classic - mv config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full \ - config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.classic.full + if [ -e "config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full" ]; then + cat config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full >>config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.classic.full + rm config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full + fi + if [ -e "config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full" ]; then + cat config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full >>config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.classic.full + rm config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full + fi # the live layer, contains all packages for the live session installer # TODO: we should probably add the kernel per KERNEL_FLAVOURS add_package minimal.standard.live linux-generic casper lvm2 mdadm diff --git a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary index 6bffc439..3c668b30 100644 --- a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary +++ b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary @@ -2,7 +2,7 @@ set -eux -case $PASS in +case ${PASS:-} in minimal.standard.enhanced-secureboot) ;; *) diff --git a/live-build/ubuntu/hooks/020-canary-live.binary b/live-build/ubuntu/hooks/020-canary-live.binary index 9c53b281..8c834d5b 100755 --- a/live-build/ubuntu/hooks/020-canary-live.binary +++ b/live-build/ubuntu/hooks/020-canary-live.binary @@ -2,7 +2,7 @@ set -eux -case $PASS in +case ${PASS:-} in minimal.standard.live) ;; *) diff --git a/live-build/ubuntu/hooks/020-canary-live.chroot_early b/live-build/ubuntu/hooks/020-canary-live.chroot_early index 884b05b5..5bd741dd 100755 --- a/live-build/ubuntu/hooks/020-canary-live.chroot_early +++ b/live-build/ubuntu/hooks/020-canary-live.chroot_early @@ -2,7 +2,7 @@ set -eu -case $PASS in +case ${PASS:-} in minimal.standard.live) ;; *)