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/build/envkernel.py

@@ -132,7 +132,7 @@ def run_abuild(
     """
     chroot = Chroot.native()
     build_path = Path("/home/pmos/build")
-    kbuild_out_source = "/mnt/linux/.output"
+    kbuild_out_source = f"/mnt/linux/{kbuild_out}"
 
     # If the kernel was cross-compiled on the host rather than with the envkernel
     # helper, we can still use the envkernel logic to package the artifacts for
@@ -180,13 +180,7 @@ def run_abuild(
     )
 
     # Create symlink from abuild working directory to envkernel build directory
-    if kbuild_out != "":
-        if os.path.islink(chroot / "mnt/linux" / kbuild_out) and os.path.lexists(
-            chroot / "mnt/linux" / kbuild_out
-        ):
-            pmb.chroot.root(["rm", Path("/mnt/linux", kbuild_out)])
-        pmb.chroot.root(["ln", "-s", "/mnt/linux", build_path / "src"])
-    pmb.chroot.root(["ln", "-s", kbuild_out_source, build_path / "src" / kbuild_out])
+    pmb.chroot.root(["ln", "-sf", "/mnt/linux", build_path / "src"])
 
     cmd: list[PathString] = ["cp", apkbuild_path, chroot / build_path / "APKBUILD"]
     pmb.helpers.run.root(cmd)

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