[neon/infrastructure/pangea-data] imager: sync configs and allow ko and dev to build again
Carlos De Maine
null at kde.org
Mon Sep 30 07:10:45 BST 2024
Git commit 320887a46772708fefcc9d87cf0602b2166aeec3 by Carlos De Maine.
Committed on 30/09/2024 at 06:10.
Pushed by carlosdem into branch 'master'.
sync configs and allow ko and dev to build again
M +2 -3 imager/build.sh
M +11 -3 imager/config-settings-neon-arm64.sh
M +12 -3 imager/config-settings-neon-bigscreen.sh
C +6 -2 imager/config-settings-neon-developer.sh [from: imager/config-settings-neon.sh - 083% similarity]
C +6 -2 imager/config-settings-neon-ko.sh [from: imager/config-settings-neon.sh - 084% similarity]
M +12 -3 imager/config-settings-neon-mobile.sh
M +6 -2 imager/config-settings-neon.sh
https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/320887a46772708fefcc9d87cf0602b2166aeec3
diff --git a/imager/build.sh b/imager/build.sh
index 267debe..8104f75 100755
--- a/imager/build.sh
+++ b/imager/build.sh
@@ -126,9 +126,8 @@ export LB_ARCHIVES="http://archive.neon.kde.org/${NEONARCHIVE}"
[ -z "$BUILD_HOOKS" ] && BUILD_HOOKS="$(dirname "$0")/build-hooks-${IMAGENAME}"
[ -z "$SEEDED_SNAPS" ] && SEEDED_SNAPS="$(dirname "$0")/seeded-snaps-${IMAGENAME}"
-# jriddell 03-2019 special case where developer and ko ISOs get their build hooks to allow for simpler ISO names
-# carlosd 09-24 limit to jammy as from noble on we want dist in the iso name
-if [ $TYPE = 'developer' ] || [ $TYPE = 'ko' ] || [ $TYPE = 'mobile' ] || [ $TYPE = 'bigscreen' ] && [ $DIST = 'jammy' ]; then
+# direct to correct config and hook locations
+if [ $TYPE = 'developer' ] || [ $TYPE = 'ko' ] || [ $TYPE = 'mobile' ] || [ $TYPE = 'bigscreen' ]; then
CONFIG_SETTINGS="$(dirname "$0")/config-settings-${IMAGENAME}-${TYPE}.sh"
CONFIG_HOOKS="$(dirname "$0")/config-hooks-${IMAGENAME}-${TYPE}"
BUILD_HOOKS="$(dirname "$0")/build-hooks-${IMAGENAME}-${TYPE}"
diff --git a/imager/config-settings-neon-arm64.sh b/imager/config-settings-neon-arm64.sh
index 091a76a..0669e2b 100644
--- a/imager/config-settings-neon-arm64.sh
+++ b/imager/config-settings-neon-arm64.sh
@@ -1,19 +1,27 @@
set -ex
-echo "neon -- config-settings-neon"
+echo "neon -- config-settings-neon-plasma-desktop-arm64"
EDITION=$(echo $NEONARCHIVE | sed 's,/, ,')
+
+## set the various publishing deets
+export LB_ISO_APPLICATION="KDE neon Plasma Desktop arm64 Live"
+export LB_ISO_PREPARER="KDE neon team"
+export LB_ISO_PUBLISHER="KDE neon team"
+export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} Mobile \$(date +%Y%m%d)"
+
+## other various other live-build settings
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_GRUB_SPLASH="breeze"
+## set our kernel prefs
if [ "$VERSION_CODENAME" = "jammy" ]; then
export LB_LINUX_FLAVOURS="generic-hwe-22.04"
else
export LB_LINUX_FLAVOURS="generic-hwe-24.04"
fi
+## convenience settings
export _COLOR="true"
export _DEBUG="true"
#export _VERBOSE="true"
diff --git a/imager/config-settings-neon-bigscreen.sh b/imager/config-settings-neon-bigscreen.sh
index 97f53ca..4fb9bc8 100644
--- a/imager/config-settings-neon-bigscreen.sh
+++ b/imager/config-settings-neon-bigscreen.sh
@@ -1,18 +1,27 @@
set -ex
-echo "neon -- config-settings-neon"
+echo "neon -- config-settings-neon-plasma-big-screen"
EDITION=$(echo $NEONARCHIVE | sed 's,/, ,')
-export LB_APT_SOURCE_ARCHIVES="true"
-export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} \$(date +%Y%m%d-%H:%M)"
+
+## set the various publishing deets
export LB_ISO_APPLICATION="KDE neon Plasma Big Screen Live"
+export LB_ISO_PREPARER="KDE neon team"
+export LB_ISO_PUBLISHER="KDE neon team"
+export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} Mobile \$(date +%Y%m%d)"
+
+## other various other live-build settings
+export LB_APT_SOURCE_ARCHIVES="true"
export LB_LINUX_PACKAGES="linux"
+#export LB_GRUB_SPLASH="breeze"
+## set our kernel prefs
if [ "$VERSION_CODENAME" = "jammy" ]; then
export LB_LINUX_FLAVOURS="generic-hwe-22.04"
else
export LB_LINUX_FLAVOURS="generic-hwe-24.04"
fi
+## convenience settings
export _COLOR="true"
export _DEBUG="true"
#export _VERBOSE="true"
diff --git a/imager/config-settings-neon.sh b/imager/config-settings-neon-developer.sh
similarity index 83%
copy from imager/config-settings-neon.sh
copy to imager/config-settings-neon-developer.sh
index 0d18f89..9e8b6e1 100644
--- a/imager/config-settings-neon.sh
+++ b/imager/config-settings-neon-developer.sh
@@ -1,22 +1,26 @@
set -ex
-echo "neon -- config-settings-neon"
+echo "neon -- config-settings-neon-plasma-desktop-developer"
EDITION=$(echo $NEONARCHIVE | sed 's,/, ,')
+
## set the various publishing deets
-export LB_ISO_APPLICATION="KDE neon Live "
+export LB_ISO_APPLICATION="KDE neon Plasma Desktop Developer Live"
export LB_ISO_PREPARER="KDE neon team"
export LB_ISO_PUBLISHER="KDE neon team"
export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} \$(date +%Y%m%d-%H:%M)"
+
## other various other live-build settings
export LB_APT_SOURCE_ARCHIVES="true"
export LB_LINUX_PACKAGES="linux"
#export LB_GRUB_SPLASH="breeze"
+
## set our kernel prefs
if [ "$VERSION_CODENAME" = "jammy" ]; then
export LB_LINUX_FLAVOURS="generic-hwe-22.04"
else
export LB_LINUX_FLAVOURS="generic-hwe-24.04"
fi
+
## convenience settings
export _COLOR="true"
export _DEBUG="true"
diff --git a/imager/config-settings-neon.sh b/imager/config-settings-neon-ko.sh
similarity index 84%
copy from imager/config-settings-neon.sh
copy to imager/config-settings-neon-ko.sh
index 0d18f89..2cd93fd 100644
--- a/imager/config-settings-neon.sh
+++ b/imager/config-settings-neon-ko.sh
@@ -1,22 +1,26 @@
set -ex
-echo "neon -- config-settings-neon"
+echo "neon -- config-settings-neon-plasma-desktop-ko"
EDITION=$(echo $NEONARCHIVE | sed 's,/, ,')
+
## set the various publishing deets
-export LB_ISO_APPLICATION="KDE neon Live "
+export LB_ISO_APPLICATION="KDE neon Plasma Desktop Ko Live"
export LB_ISO_PREPARER="KDE neon team"
export LB_ISO_PUBLISHER="KDE neon team"
export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} \$(date +%Y%m%d-%H:%M)"
+
## other various other live-build settings
export LB_APT_SOURCE_ARCHIVES="true"
export LB_LINUX_PACKAGES="linux"
#export LB_GRUB_SPLASH="breeze"
+
## set our kernel prefs
if [ "$VERSION_CODENAME" = "jammy" ]; then
export LB_LINUX_FLAVOURS="generic-hwe-22.04"
else
export LB_LINUX_FLAVOURS="generic-hwe-24.04"
fi
+
## convenience settings
export _COLOR="true"
export _DEBUG="true"
diff --git a/imager/config-settings-neon-mobile.sh b/imager/config-settings-neon-mobile.sh
index 463b0fb..20d107e 100644
--- a/imager/config-settings-neon-mobile.sh
+++ b/imager/config-settings-neon-mobile.sh
@@ -1,18 +1,27 @@
set -ex
-echo "neon -- config-settings-neon"
+echo "neon -- config-settings-neon-plasma-mobile"
EDITION=$(echo $NEONARCHIVE | sed 's,/, ,')
-export LB_APT_SOURCE_ARCHIVES="true"
-export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} Mobile \$(date +%Y%m%d)"
+
+## set the various publishing deets
export LB_ISO_APPLICATION="KDE neon Plasma Mobile Live"
+export LB_ISO_PREPARER="KDE neon team"
+export LB_ISO_PUBLISHER="KDE neon team"
+export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} Mobile \$(date +%Y%m%d)"
+
+## other various other live-build settings
+export LB_APT_SOURCE_ARCHIVES="true"
export LB_LINUX_PACKAGES="linux"
+#export LB_GRUB_SPLASH="breeze"
+## set our kernel prefs
if [ "$VERSION_CODENAME" = "jammy" ]; then
export LB_LINUX_FLAVOURS="generic-hwe-22.04"
else
export LB_LINUX_FLAVOURS="generic-hwe-24.04"
fi
+## convenience settings
export _COLOR="true"
export _DEBUG="true"
#export _VERBOSE="true"
diff --git a/imager/config-settings-neon.sh b/imager/config-settings-neon.sh
index 0d18f89..a755569 100644
--- a/imager/config-settings-neon.sh
+++ b/imager/config-settings-neon.sh
@@ -1,22 +1,26 @@
set -ex
-echo "neon -- config-settings-neon"
+echo "neon -- config-settings-neon-plasma-desktop"
EDITION=$(echo $NEONARCHIVE | sed 's,/, ,')
+
## set the various publishing deets
-export LB_ISO_APPLICATION="KDE neon Live "
+export LB_ISO_APPLICATION="KDE neon Plasma Desktop Live"
export LB_ISO_PREPARER="KDE neon team"
export LB_ISO_PUBLISHER="KDE neon team"
export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} \$(date +%Y%m%d-%H:%M)"
+
## other various other live-build settings
export LB_APT_SOURCE_ARCHIVES="true"
export LB_LINUX_PACKAGES="linux"
#export LB_GRUB_SPLASH="breeze"
+
## set our kernel prefs
if [ "$VERSION_CODENAME" = "jammy" ]; then
export LB_LINUX_FLAVOURS="generic-hwe-22.04"
else
export LB_LINUX_FLAVOURS="generic-hwe-24.04"
fi
+
## convenience settings
export _COLOR="true"
export _DEBUG="true"
More information about the Neon-commits
mailing list