From 5b55abd4d2d15dacb1caddf477fdce60dda1cfb3 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 22 Jul 2020 15:54:21 +0200 Subject: [PATCH] pmbootstrap aportgen: don't use CDN alpine mirror (MR 1963) Use a deterministic mirror URL instead of CDN for aportgen. Otherwise we may generate a pmaport that wraps an apk from Alpine (e.g. musl-armv7) locally with one up-to-date mirror given by the CDN. But then the build will fail if CDN picks an outdated mirror for CI or BPO. --- pmb/aportgen/busybox_static.py | 2 +- pmb/aportgen/grub_efi.py | 2 +- pmb/aportgen/musl.py | 2 +- pmb/config/__init__.py | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pmb/aportgen/busybox_static.py b/pmb/aportgen/busybox_static.py index 224583cf..c5711ef7 100644 --- a/pmb/aportgen/busybox_static.py +++ b/pmb/aportgen/busybox_static.py @@ -42,7 +42,7 @@ def generate(args, pkgname): pkgrel={pkgrel} _arch="{arch}" - _mirror="{args.mirror_alpine}" + _mirror="{pmb.config.aportgen_mirror_alpine}" url="http://busybox.net" license="GPL2" diff --git a/pmb/aportgen/grub_efi.py b/pmb/aportgen/grub_efi.py index 1eb6978c..cc2098b7 100644 --- a/pmb/aportgen/grub_efi.py +++ b/pmb/aportgen/grub_efi.py @@ -37,7 +37,7 @@ def generate(args, pkgname): pkgrel={pkgrel} _arch="{arch}" - _mirror="{args.mirror_alpine}" + _mirror="{pmb.config.aportgen_mirror_alpine}" pkgdesc="GRUB $_arch EFI files for every architecture" url="https://www.gnu.org/software/grub/" diff --git a/pmb/aportgen/musl.py b/pmb/aportgen/musl.py index 296ce9db..9b5c3424 100644 --- a/pmb/aportgen/musl.py +++ b/pmb/aportgen/musl.py @@ -47,7 +47,7 @@ def generate(args, pkgname): subpackages="musl-dev-{arch}:package_dev" _arch="{arch}" - _mirror="{args.mirror_alpine}" + _mirror="{pmb.config.aportgen_mirror_alpine}" url="https://musl-libc.org" license="MIT" diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py index 52c3bfe2..21d589d5 100644 --- a/pmb/config/__init__.py +++ b/pmb/config/__init__.py @@ -553,6 +553,12 @@ aportgen = { } } +# Use a deterministic mirror URL instead of CDN for aportgen. Otherwise we may +# generate a pmaport that wraps an apk from Alpine (e.g. musl-armv7) locally +# with one up-to-date mirror given by the CDN. But then the build will fail if +# CDN picks an outdated mirror for CI or BPO. +aportgen_mirror_alpine = "http://dl-2.alpinelinux.org/alpine/" + # # NEWAPKBUILD # Options passed through to the "newapkbuild" command from Alpine Linux. They