[neon/neon/livecd-rootfs/Neon/release_focal] live-build/ubuntu-server/hooks: Adjust the PROJECT name in the live-server hooks for SUBARCH.

[Łukasz 'sil2100' Zemczak]

Git commit e1d51ec263255167507a783dbec7abc4a0965dd0 by Łukasz 'sil2100' Zemczak.
Committed on 10/06/2022 at 15:53.
Pushed by jriddell into branch 'Neon/release_focal'.

Adjust the PROJECT name in the live-server hooks for SUBARCH.

M  +2    -0    live-build/ubuntu-server/hooks/030-root-squashfs.binary
M  +2    -0    live-build/ubuntu-server/hooks/032-installer-squashfs.binary
M  +2    -0    live-build/ubuntu-server/hooks/033-kernel-bits.binary

https://invent.kde.org/neon/neon/livecd-rootfs/commit/e1d51ec263255167507a783dbec7abc4a0965dd0

diff --git a/live-build/ubuntu-server/hooks/030-root-squashfs.binary b/live-build/ubuntu-server/hooks/030-root-squashfs.binary
index 7f1b41c3..03dc0ead 100755
--- a/live-build/ubuntu-server/hooks/030-root-squashfs.binary
+++ b/live-build/ubuntu-server/hooks/030-root-squashfs.binary
@@ -22,6 +22,8 @@ fi
 
 . config/functions
 
+PROJECT=$PROJECT${SUBARCH:+-$SUBARCH}
+
 mkdir binary/boot/squashfs.dir
 cp -a chroot/* binary/boot/squashfs.dir
 
diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
index c4e8d67e..82261812 100755
--- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
+++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
@@ -29,6 +29,8 @@ FILESYSTEM_ROOT=binary/boot/squashfs.dir
 INSTALLER_ROOT=binary/boot/installer.squashfs.dir
 OVERLAY_ROOT=binary/overlay
 
+PROJECT=$PROJECT${SUBARCH:+-$SUBARCH}
+
 mkdir -p "$INSTALLER_ROOT" "$OVERLAY_ROOT"
 
 # Create an installer squashfs layer
diff --git a/live-build/ubuntu-server/hooks/033-kernel-bits.binary b/live-build/ubuntu-server/hooks/033-kernel-bits.binary
index d0968512..587099b1 100755
--- a/live-build/ubuntu-server/hooks/033-kernel-bits.binary
+++ b/live-build/ubuntu-server/hooks/033-kernel-bits.binary
@@ -27,6 +27,8 @@ INSTALLER_ROOT=binary/boot/installer.squashfs.dir
 KERNEL_BITS_ROOT=binary/boot/kernel-bits.dir
 KERNEL_BITS_OVERLAY=binary/boot/overlay-kernel-bits
 
+PROJECT=$PROJECT${SUBARCH:+-$SUBARCH}
+
 case ${SUBARCH-} in
 	intel-iot)
 		variants='intel'