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

3 years ago · e1d51ec263
parent 7410fc4a3e
commit e1d51ec263
3 changed files with 6 additions and 0 deletions
--- 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

--- 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
--- 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'