pmb/aportgen/busybox_static.py

@@ -16,7 +16,7 @@ def generate(pkgname: str) -> None:
     context = get_context()
 
     # Parse version from APKINDEX
-    package_data = pmb.parse.apkindex.package("busybox")
+    package_data = pmb.parse.apkindex.package("busybox", arch=arch)
 
     if package_data is None:
         raise RuntimeError("Couldn't find APKINDEX for busybox!")

pmb/aportgen/core.py

@@ -208,7 +208,7 @@ def get_upstream_aport(pkgname: str, arch: Arch | None = None, retain_branch: bo
     repo = split[-2]
     pkgname = split[-1]
     index_path = pmb.helpers.repo.alpine_apkindex_path(repo, arch)
-    package = pmb.parse.apkindex.package(pkgname, indexes=[index_path])
+    package = pmb.parse.apkindex.package(pkgname, indexes=[index_path], arch=arch)
 
     if package is None:
         raise RuntimeError(f"Couldn't find {pkgname} in APKINDEX!")

pmb/aportgen/grub_efi.py

@@ -15,7 +15,7 @@ def generate(pkgname: str) -> None:
     arch = Arch.x86
     if pkgname != "grub-efi-x86":
         raise RuntimeError("only grub-efi-x86 is available")
-    package_data = pmb.parse.apkindex.package("grub")
+    package_data = pmb.parse.apkindex.package("grub", arch=arch)
     if package_data is None:
         raise RuntimeError("Couldn't find package grub!")
     version = package_data.version

pmb/aportgen/musl.py

@@ -15,7 +15,7 @@ def generate(pkgname: str) -> None:
     arch = Arch.from_str(pkgname.split("-")[1])
 
     # Parse musl version from APKINDEX
-    package_data = pmb.parse.apkindex.package("musl")
+    package_data = pmb.parse.apkindex.package("musl", arch=arch)
     if package_data is None:
         raise RuntimeError("Couldn't find package musl!")
     version = package_data.version

pmb/config/__init__.py

@@ -31,6 +31,7 @@ apk_keys_path: Path = pmb_src / "pmb/data/keys"
 # exploit the system!)
 apk_tools_min_version = {
     "edge": "2.14.4-r4",
+    "v3.21": "2.14.4-r4",
     "v3.20": "2.14.4-r1",
     "v3.19": "2.14.4-r0",
     "v3.18": "2.14.4-r0",

pmb/helpers/git.py

@@ -116,7 +116,7 @@ def get_upstream_remote(aports: Path) -> str:
     urls = pmb.config.git_repos[name_repo]
     lines = list_remotes(aports)
     for line in lines:
-        if any(u in line for u in urls):
+        if any(u.lower() in line.lower() for u in urls):
             return line.split("\t", 1)[0]
 
     # Fallback to old URLs, in case the migration was not done yet