From 460d2c0eb45f0dbad83b62398ccd962037baff5c Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 12 May 2020 21:41:46 +0200 Subject: [PATCH] pmb/aportgen/grub_efi.py: alpine mirrordir (MR 1950) On branch stable, we would use Alpine's mirrordir "v3.11" for example. --- pmb/aportgen/grub_efi.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pmb/aportgen/grub_efi.py b/pmb/aportgen/grub_efi.py index 4e8a2443..54ad09b6 100644 --- a/pmb/aportgen/grub_efi.py +++ b/pmb/aportgen/grub_efi.py @@ -39,6 +39,9 @@ def generate(args, pkgname): "buildroot_" + arch, "/var/cache/distfiles", output_return=True) + # Write the APKBUILD + channel_cfg = pmb.config.pmaports.read_config_channel(args) + mirrordir = channel_cfg["mirrordir_alpine"] pmb.helpers.run.user(args, ["mkdir", "-p", args.work + "/aportgen"]) with open(args.work + "/aportgen/APKBUILD", "w", encoding="utf-8") as handle: apkbuild = f"""\ @@ -56,7 +59,7 @@ def generate(args, pkgname): url="https://www.gnu.org/software/grub/" license="GPL-3.0-or-later" arch="all" - source="grub-efi-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/grub-efi-$pkgver-r$pkgrel.apk" + source="grub-efi-$pkgver-r$pkgrel-$_arch.apk::$_mirror/{mirrordir}/main/$_arch/grub-efi-$pkgver-r$pkgrel.apk" package() {{ mkdir -p "$pkgdir"