[neon/infrastructure/pangea-data] imager: back to syslinux for the time being

[Carlos De Maine]

Git commit ff6d16282f2b5665fe3a57cb1fd04352fb1ce525 by Carlos De Maine.
Committed on 27/08/2024 at 16:02.
Pushed by carlosdem into branch 'master'.

back to syslinux for the time being

M  +1    -2    imager/config-settings-neon-arm64.sh
M  +1    -2    imager/config-settings-neon.sh
M  +10   -10   imager/ubuntu-defaults-image

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

diff --git a/imager/config-settings-neon-arm64.sh b/imager/config-settings-neon-arm64.sh
index dc5c913..091a76a 100644
--- a/imager/config-settings-neon-arm64.sh
+++ b/imager/config-settings-neon-arm64.sh
@@ -6,8 +6,7 @@ export LB_APT_SOURCE_ARCHIVES="true"
 export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} \$(date +%Y%m%d)"
 export LB_ISO_APPLICATION="KDE neon arm64 Live"
 export LB_LINUX_PACKAGES="linux"
-export LB_SYSLINUX_THEME="live-build"
-export LB_GRUB_SPLASH="breeze"
+#export LB_GRUB_SPLASH="breeze"
 
 if [ "$VERSION_CODENAME" = "jammy" ]; then
     export LB_LINUX_FLAVOURS="generic-hwe-22.04"
diff --git a/imager/config-settings-neon.sh b/imager/config-settings-neon.sh
index 48af708..6875be6 100644
--- a/imager/config-settings-neon.sh
+++ b/imager/config-settings-neon.sh
@@ -6,8 +6,7 @@ export LB_APT_SOURCE_ARCHIVES="true"
 export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} \$(date +%Y%m%d-%H:%M)"
 export LB_ISO_APPLICATION="KDE neon Live"
 export LB_LINUX_PACKAGES="linux"
-export LB_SYSLINUX_THEME="live-build"
-export LB_GRUB_SPLASH="breeze"
+#export LB_GRUB_SPLASH="breeze"
 
 if [ "$VERSION_CODENAME" = "jammy" ]; then
     export LB_LINUX_FLAVOURS="generic-hwe-22.04"
diff --git a/imager/ubuntu-defaults-image b/imager/ubuntu-defaults-image
index 4702a31..41412f4 100755
--- a/imager/ubuntu-defaults-image
+++ b/imager/ubuntu-defaults-image
@@ -194,11 +194,13 @@ fi
 # Make sure all our dependencies (which are Recommends of our package) are
 # installed.  This is a bit dubious long-term, but seems to be needed to
 # make autobuilds reliable.
-if [ "$VERSION_CODENAME" = "jammy" ] && [ "$ARCH" = "amd64" ];  then
-    $SUDO apt-get -y install gfxboot-theme-ubuntu memtest86+ syslinux syslinux-themes-neon || exit 1
-elif [ "$VERSION_CODENAME" = "noble" ] && [ "$ARCH" = "amd64" ]; then
-    # TODO - get rid of syslinux-theme and gfxboot-theme-ubuntu usage - they are so deprecated
-    $SUDO apt-get -y install memtest86+ syslinux librsvg2-bin || exit 1
+if [ "$VERSION_CODENAME" = "jammy" ];  then
+    $SUDO apt-get -y install gfxboot-theme-ubuntu syslinux syslinux-themes-neon || exit 1
+elif [ "$VERSION_CODENAME" = "noble" ]; then
+# TODO STOP USING SYSLINUX
+    $SUDO apt-get -y install syslinux gfxboot-theme-ubuntu syslinux-themes-neon || exit 1
+elif [ "$ARCH" = "amd64" ]; then
+    $SUDO apt-get -y install memtest86+
 fi
 
 $SUDO apt-get -y install genisoimage
@@ -236,11 +238,9 @@ if [ "$COMPONENTS" ]; then
 	config/bootstrap
 fi
 
-if [ "$VERSION_CODENAME" = "jammy" ]; then
-    sed -i "s/^\\(LB_SYSLINUX_THEME=\\).*/\\1\"neon\"/" config/binary
-else
-    echo "LB_SYSLINUX_THEME=''"
-fi
+# TODO port away from syslinux
+sed -i "s/^\\(LB_SYSLINUX_THEME=\\).*/\\1\"neon\"/" config/binary
+
 
 if [ "${PACKAGE%.deb}" = "$PACKAGE" ]; then
     # package name, apt-get'able