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.
This commit is contained in:
Oliver Smith 2020-07-22 15:54:21 +02:00 committed by Alexey Min
parent a870a69151
commit 5b55abd4d2
No known key found for this signature in database
GPG Key ID: 0B19D2A65870B448
4 changed files with 9 additions and 3 deletions

View File

@ -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"

View File

@ -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/"

View File

@ -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"

View File

@ -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