.gitlab-ci.yml

@@ -14,6 +14,9 @@ before_script: &global_before_scripts
   - ".ci/note.sh"
   - apk upgrade -U
   - "adduser -D build"
+  # Force IPv4 for gitlab.postmarketos.org until it supports IPv6 too, OSUOSL is
+  # working on it (infra#195)
+  - "echo '140.211.167.182 gitlab.postmarketos.org' >> /etc/hosts"
 
 stages:
   - lint

pmb/build/_package.py

@@ -276,6 +276,10 @@ def prioritise_build_queue(disarray: list[BuildQueueItem]) -> list[BuildQueueIte
                     raise NonBugError(f"{item['name']}: dependency not found: {dep}")
                 dep = dep_data.pkgname
 
+                # If the dependency is a subpackage we can safely ignore it
+                if dep in item["apkbuild"]["subpackages"]:
+                    continue
+
                 if dep in all_pkgnames:
                     unmet_deps.setdefault(item["name"], []).append(dep)
                     missing_deps = True

pmb/commands/__init__.py

@@ -68,7 +68,9 @@ def run_command(args: PmbArgs):
         case "flasher":
             command = Flasher(
                 args.action_flasher,
-                args.autoinstall,
+                # FIXME: defaults copied from pmb/helpers/arguments.py
+                # we should have these defaults defined in one place!
+                getattr(args, "autoinstall", True),
                 getattr(args, "cmdline", None),
                 args.flash_method,
                 getattr(args, "no_reboot", None),