[neon/infrastructure/pangea-data] imager: third time is a charm with variables

Carlos De Maine null at kde.org
Wed Aug 7 01:29:42 BST 2024


Git commit ce1e38f6d5546e75b07958116a9289967116c81d by Carlos De Maine.
Committed on 07/08/2024 at 00:29.
Pushed by carlosdem into branch 'master'.

third time is a charm with variables

M  +1    -1    imager/build-hooks-neon/012-firefox.chroot
M  +3    -3    imager/config-hooks-neon/repo.sh

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

diff --git a/imager/build-hooks-neon/012-firefox.chroot b/imager/build-hooks-neon/012-firefox.chroot
index f126b3d..13a0909 100644
--- a/imager/build-hooks-neon/012-firefox.chroot
+++ b/imager/build-hooks-neon/012-firefox.chroot
@@ -4,7 +4,7 @@
 
 # Mask certain packages which aren't getting properly covered by dependencies.
 
-set -e
+set -ex
 
 . /etc/os-release
 
diff --git a/imager/config-hooks-neon/repo.sh b/imager/config-hooks-neon/repo.sh
index 63bc89e..07b8a6d 100644
--- a/imager/config-hooks-neon/repo.sh
+++ b/imager/config-hooks-neon/repo.sh
@@ -30,12 +30,12 @@ curl -sS https://archive.neon.kde.org/public.key | tee /etc/apt/keyrings/neon-ar
 echo "# KDE neon sources have moved to /etc/apt/sources.list.d/neon.sources" >> config/archives/neon.list
 
 cat > config/archives/neon.sources << EOF
-X-Repolib-Name: KDE neon
+X-Repolib-Name: KDE neon $SUITE $FLAVOR
 Types: deb deb-src
-URIs: $LB_MIRROR_BOOTSTRAP
+URIs: $MIRROR
 Suites: $SUITE
 Components: $COMPONENTS
-Architectures: $LB_BUILD_ARCH
+Architectures: $ARCH
 Signed-By: /etc/apt/keyrings/neon-archive-keyring-pubkey.gpg
 EOF
 


More information about the Neon-commits mailing list