[neon/infrastructure/pangea-data] imager: all in on getting rid of syslinux-themes

[Carlos De Maine]

Git commit e06a044df89e3a60966e5fbd6d252cc3c8e5c1da by Carlos De Maine.
Committed on 27/08/2024 at 13:23.
Pushed by carlosdem into branch 'master'.

all in on getting rid of syslinux-themes

M  +2    -0    imager/config-settings-neon.sh
M  +6    -2    imager/ubuntu-defaults-image

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

diff --git a/imager/config-settings-neon.sh b/imager/config-settings-neon.sh
index c733176..193c4b2 100644
--- a/imager/config-settings-neon.sh
+++ b/imager/config-settings-neon.sh
@@ -6,6 +6,8 @@ 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=""
+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 e80f4ed..0488df6 100755
--- a/imager/ubuntu-defaults-image
+++ b/imager/ubuntu-defaults-image
@@ -198,7 +198,7 @@ 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 gfxboot-theme-ubuntu memtest86+ syslinux syslinux-themes-neon || exit 1
+    $SUDO apt-get -y install memtest86+ syslinux || exit 1
 fi
 
 $SUDO apt-get -y install genisoimage
@@ -236,7 +236,11 @@ if [ "$COMPONENTS" ]; then
 	config/bootstrap
 fi
 
-sed -i "s/^\\(LB_SYSLINUX_THEME=\\).*/\\1\"neon\"/" config/binary
+if [ "$VERSION_CODENAME" = "jammy" ]; then
+    sed -i "s/^\\(LB_SYSLINUX_THEME=\\).*/\\1\"neon\"/" config/binary
+else
+    echo "LB_SYSLINUX_THEME=''"
+fi
 
 if [ "${PACKAGE%.deb}" = "$PACKAGE" ]; then
     # package name, apt-get'able