[neon/infrastructure/pangea-data] imager: set LB_BUILD_ARCH and make sure cd-boot-images-$ARCH is installed

[Carlos De Maine]

Git commit a1697aaa040667bbfc749c1c47bc460cb021921f by Carlos De Maine.
Committed on 15/05/2024 at 01:55.
Pushed by carlosdem into branch 'master'.

set LB_BUILD_ARCH and make sure cd-boot-images-$ARCH is installed

M  +4    -1    imager/build.sh
M  +4    -3    imager/ubuntu-defaults-image

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/a1697aaa040667bbfc749c1c47bc460cb021921f

diff --git a/imager/build.sh b/imager/build.sh
index 404b8c9..a671952 100755
--- a/imager/build.sh
+++ b/imager/build.sh
@@ -46,7 +46,10 @@ sudo apt install -y --no-install-recommends \
     livecd-rootfs xorriso base-files lsb-release neon-settings debootstrap \
     syslinux-themes-neon
 if [ $ARCH = 'amd64' ]; then
-    sudo apt install -y --no-install-recommends syslinux-utils
+    sudo apt install -y --no-install-recommends syslinux-utils cd-boot-images-amd64
+fi
+if [ $ARCH = 'arm64' ]; then
+    sudo apt install -y --no-install-recommends cd-boot-images-arm64
 fi
 cd $WD
 ls -lah
diff --git a/imager/ubuntu-defaults-image b/imager/ubuntu-defaults-image
index 557a5bf..5791fdb 100755
--- a/imager/ubuntu-defaults-image
+++ b/imager/ubuntu-defaults-image
@@ -212,9 +212,10 @@ if [ -e "$CONFIG_SETTINGS" ]; then
     . $CONFIG_SETTINGS
 fi
 
-SUITE="$SUITE" PROJECT="$FLAVOR" ARCH="$ARCH" LB_ARCHITECTURES="$ARCH" \
-    LB_MIRROR_BOOTSTRAP="$MIRROR" LB_MIRROR_CHROOT_SECURITY="$SECURITY_MIRROR" \
-    IMAGEFORMAT=squashfs BINARYFORMAT=iso-hybrid ISOHYBRID_OPTIONS="--uefi" lb config
+SUITE="$SUITE" PROJECT="$FLAVOR" ARCH="$ARCH" LB_ARCHITECTURES="$ARCH" LB_BUILD_ARCH="$ARCH"\
+LB_MIRROR_BOOTSTRAP="$MIRROR" LB_MIRROR_CHROOT_SECURITY="$SECURITY_MIRROR" \
+IMAGEFORMAT=squashfs BINARYFORMAT=iso-hybrid ISOHYBRID_OPTIONS="--uefi" lb config
+
 
 echo "LB_LINUX_FLAVOURS=\"$LB_LINUX_FLAVOURS\"" >> config/chroot