[neon/infrastructure/pangea-data] imager: ab(use) LB_ARCHIVES

Carlos De Maine null at kde.org
Wed Aug 7 04:36:23 BST 2024


Git commit 44c13f02dbc7a5972b8d8ef9012c004ed9c5beb5 by Carlos De Maine.
Committed on 07/08/2024 at 03:36.
Pushed by carlosdem into branch 'master'.

ab(use) LB_ARCHIVES

M  +7    -0    imager/build.sh

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

diff --git a/imager/build.sh b/imager/build.sh
index 562b784..d912331 100755
--- a/imager/build.sh
+++ b/imager/build.sh
@@ -102,18 +102,25 @@ DATE="${_DATE}${_TIME}"
 # used in e.g. renaming the ubiquity .desktop file on Desktop by casper which gets it from /cdrom/.disk/info from live-build lb_binary_disk
 EDITION=$TYPE
 export RELEASE_${DIST}=${EDITION}
+
 ## Bring down the overall size a bit by using a more sophisticated albeit expensive algorithm.
 export LB_COMPRESSION=none
+
 ## Create a zsync file allowing over-http delta-downloads.
 export LB_ZSYNC=true # This is overridden by silly old defaults-image...
+
 ## Use our cache as proxy.
 # FIXME: get out of nci/lib/setup_repo.rb
 export LB_APT_HTTP_PROXY="http://apt.cache.pangea.pub:8000"
+
 ## Also set the proxy on apt options. This is used internally to expand on a lot
 ## of apt-get calls. For us primarily of interest because it is used for
 ## lb_source, which would otherwise bypass the proxy entirely.
 export APT_OPTIONS="--yes -o Acquire::http::Proxy='$LB_APT_HTTP_PROXY'"
 
+## see if we can (ab)use LB_ARCHIVES to help with problematic neon.sources getting to the chroot
+export LB_ARCHIVES="http://archive.neon.kde.org/${NEONARCHIVE}"
+
 [ -z "$CONFIG_SETTINGS" ] && CONFIG_SETTINGS="$(dirname "$0")/config-settings-${IMAGENAME}.sh"
 [ -z "$CONFIG_HOOKS" ] && CONFIG_HOOKS="$(dirname "$0")/config-hooks-${IMAGENAME}"
 [ -z "$BUILD_HOOKS" ] && BUILD_HOOKS="$(dirname "$0")/build-hooks-${IMAGENAME}"


More information about the Neon-commits mailing list