.ci/ruff.sh

@@ -5,7 +5,9 @@
 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk -q add py3-pip
-	pip install --break-system-packages --no-warn-script-location ruff
+	# pin to ruff 0.11.0 until this is fixed:
+	# https://github.com/astral-sh/ruff/issues/16874
+	pip install --break-system-packages --no-warn-script-location ruff==0.11.0
 	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi
 

.gitlab-ci.yml

@@ -170,6 +170,8 @@ force build amd64:
   # cross compiling: unnecessary
     - .ci/integration_tests/force_build x86_64 hello-world
     - .ci/integration_tests/force_build x86_64 postmarketos-mkinitfs
+  # cross compiling: unnecessary (different arch but no cpu emulation required)
+    - .ci/integration_tests/force_build x86 hello-world
   # cross compiling: qemu-only
     - PMB_EXTRA_ARGS="--no-cross" .ci/integration_tests/force_build aarch64 hello-world
   # cross compiling: crossdirect

pmb/build/_package.py

@@ -681,7 +681,7 @@ def packages(
             depends_build = apkbuild["makedepends_build"]
         else:
             depends_build = apkbuild["makedepends"]
-            if depends_build and depends_host:
+            if depends_build and depends_host and cross == CrossCompile.CROSS_NATIVE2:
                 logging.warning(
                     "WARNING: makedepends not split into _host and _build variants."
                     " Trying to install all makedepends in both environments, please"

pmb/ci/__init__.py

@@ -107,7 +107,7 @@ def ask_which_scripts_to_run(
 
     """
     count = len(scripts_available.items())
-    choices = ["all"]
+    choices = []
 
     logging.info(f"Available CI scripts ({count}):")
     for script_name, script in scripts_available.items():
@@ -117,13 +117,17 @@ def ask_which_scripts_to_run(
         logging.info(f"* {script_name}: {script['description']}{extra}")
         choices += [script_name]
 
-    selection = pmb.helpers.cli.ask("Which script?", None, "all", complete=choices)
+    choice_regex = "|".join(choices)
+    ci_regex = f"(all)|({choice_regex})(,({choice_regex}))*"
+    choices += ["all"]
+    logging.info('Fill a comma-separated list of scripts or "all"')
+    selection = pmb.helpers.cli.ask(
+        "Scripts", None, "all", validation_regex=ci_regex, complete=choices
+    )
     if selection == "all":
         return scripts_available
-
-    ret = {}
-    ret[selection] = scripts_available[selection]
-    return ret
+    else:
+        return {script: scripts_available[script] for script in selection.split(",")}
 
 
 def copy_git_repo_to_chroot(topdir: Path) -> None:

pmb/flasher/run.py

@@ -103,6 +103,13 @@ def run(
                     check_partition_blacklist(deviceinfo, key, value)
                     command[i] = command[i].replace(key, value)
 
+        # Remove cmdline if it's empty
+        if "--cmdline" in command:
+            i = command.index("--cmdline")
+            if i + 1 < len(command) and not command[i + 1]:
+                command.pop(i)  # "--cmdline"
+                command.pop(i)  # ""
+
         # Remove empty strings
         command = [x for x in command if x != ""]
         # Run the action

pmb/types.py

@@ -12,7 +12,10 @@ from pmb.core.chroot import Chroot
 
 
 class CrossCompile(enum.Enum):
-    # Cross compilation isn't needed for this package
+    # Cross compilation isn't needed for this package:
+    # 1) Either because the arch we will build for is exactly the same as the
+    #    native arch, or
+    # 2) because CPU emulation is not needed (e.g. x86 on x86_64)
     UNNECESSARY = "unnecessary"
     # Cross compilation disabled, only use QEMU
     QEMU_ONLY = "qemu-only"
@@ -49,11 +52,9 @@ class CrossCompile(enum.Enum):
             return Chroot.native()
 
         match self:
-            case CrossCompile.CROSSDIRECT | CrossCompile.QEMU_ONLY:
+            case CrossCompile.UNNECESSARY | CrossCompile.CROSSDIRECT | CrossCompile.QEMU_ONLY:
                 return Chroot.buildroot(arch)
-            # FIXME: are there cases where we're building for a different arch
-            # but don't need to cross compile?
-            case CrossCompile.UNNECESSARY | CrossCompile.CROSS_NATIVE | CrossCompile.CROSS_NATIVE2:
+            case CrossCompile.CROSS_NATIVE | CrossCompile.CROSS_NATIVE2:
                 return Chroot.native()