From 903582a239b49d14d2900beef766ec26018482b5 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Sat, 30 Sep 2023 06:51:10 +0000 Subject: [PATCH] Imported 23.10.50 from mantic-release pocket. No reason for CPC update specified. --- debian/changelog | 6 ++++++ live-build/ubuntu/hooks/020-ubuntu-live.binary | 2 ++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index e0c6af89..d8cc3949 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (23.10.50) mantic; urgency=medium + + * live-build/ubuntu/hooks: ensure kernel artifacts named with subarch + + -- Dimitri John Ledkov Fri, 29 Sep 2023 21:36:07 +0100 + livecd-rootfs (23.10.49) mantic; urgency=medium [ Phil Roche ] diff --git a/live-build/ubuntu/hooks/020-ubuntu-live.binary b/live-build/ubuntu/hooks/020-ubuntu-live.binary index f9d47288..7f44aad8 100755 --- a/live-build/ubuntu/hooks/020-ubuntu-live.binary +++ b/live-build/ubuntu/hooks/020-ubuntu-live.binary @@ -21,6 +21,8 @@ fi . config/binary . config/functions +PROJECT=$PROJECT${SUBARCH:+-$SUBARCH} + mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-generic mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-generic chmod a+r ${PWD}/livecd.${PROJECT}.initrd-generic ${PWD}/livecd.${PROJECT}.kernel-generic