pmb/build/_package.py

@@ -82,6 +82,12 @@ def get_depends(context: Context, apkbuild):
         ret += apkbuild["checkdepends"]
     if not context.ignore_depends:
         ret += apkbuild["depends"]
+        for subpkgname, subpkg in apkbuild["subpackages"].items():
+            if not subpkg:
+                continue
+            logging.verbose(f"{apkbuild['pkgname']}: adding subpackage depends: {subpkgname}")
+            ret += subpkg["depends"]
+
     ret = sorted(set(ret))
 
     # Don't recurse forever when a package depends on itself (#948)

pmb/chroot/apk.py

@@ -201,10 +201,6 @@ def install_run_apk(to_add: list[str], to_add_local: list[Path], to_del: list[st
         commands += [["del"] + to_del]
 
     channel = pmb.config.pmaports.read_config()["channel"]
-    # FIXME: use /mnt/pmb… until MR 2351 is reverted (pmb#2388)
-    # user_repo = work / "packages" / channel
-    user_repo = os.path.join("/mnt/pmbootstrap/packages/", channel)
-
     # There are still some edgecases where we manage to get here while the chroot is not
     # initialized. To not break the build, we initialize it here but print a big warning
     # and a stack trace so hopefully folks report it.
@@ -214,14 +210,16 @@ def install_run_apk(to_add: list[str], to_add_local: list[Path], to_del: list[st
         traceback.print_stack(file=logging.logfd)
         pmb.chroot.init(chroot)
 
+    # FIXME: use /mnt/pmb… until MR 2351 is reverted (pmb#2388)
+    user_repo = []
+    for channel in pmb.config.pmaports.all_channels():
+        user_repo += ["--repository", Path("/mnt/pmbootstrap/packages") / channel]
+
     for i, command in enumerate(commands):
         # --no-interactive is a parameter to `add`, so it must be appended or apk
         # gets confused
         command += ["--no-interactive"]
-        command = [
-            "--repository",
-            user_repo,
-        ] + command
+        command = user_repo + command
 
         # Ignore missing repos before initial build (bpo#137)
         if os.getenv("PMB_APK_FORCE_MISSING_REPOSITORIES") == "1":

pmb/install/_install.py

@@ -972,7 +972,7 @@ def print_flash_info(device: str, deviceinfo: Deviceinfo, split: bool, have_disk
         logging.info("* pmbootstrap flasher flash_rootfs")
         logging.info("  Flashes the generated rootfs image to your device:")
         if split:
-            logging.info(f"  {Chroot.native() / 'home/pmos/rootfs' / device}-rootfs.img")
+            logging.info(f"  {Chroot.native() / 'home/pmos/rootfs' / device}-root.img")
         else:
             logging.info(f"  {Chroot.native() / 'home/pmos/rootfs' / device}.img")
             logging.info(