targets: add skip-arches / only-arches filters to items-from-inventory

Lets targets.yaml scope board-based inventory items by ARCH:

  items-from-inventory:
    not-eos-with-video:
      skip-arches: [loong64, riscv64]   # or only-arches: [arm64]

Stops the compositor from emitting combinations that compile.sh
will just reject downstream as 'target not supported' (e.g.
noble + uefi-loong64, because noble doesn't declare loong64 in
its architectures list). Cuts log noise and runner minutes.

Resolution of the board's ARCH:
- armbian_utils.armbian_parse_board_file_for_static_info already
  picks up any ARCH='…' line it finds in the board conf via the
  generic top-level var regex.
- armbian_get_all_boards_inventory now falls back to the board's
  BOARDFAMILY family conf (config/sources/families/<fam>.conf)
  for boards that don't carry an explicit ARCH. The family conf
  is bash-sourced in a throwaway subshell with an EXIT trap so
  ARCH is captured even when the family conf aborts mid-source
  on a ${FOO:?required} check (ls1046a, etc).
- Family-file results are cached per family.
- Five boards with unresolvable ARCH under the fallback get an
  explicit ARCH="arm64" declaration:
    aml-t95z-plus.tvb   (comment apostrophe breaks BOARDFAMILY regex)
    ayn-odin2mini.csc   (sources ayn-odin2.csc — parser doesn't follow)
    ayn-odin2portal.csc (ditto)
    ayn-thor.csc        (ditto)
    gateway-dk.conf     (family conf aborts before subshell captures ARCH)

All 367 boards now report ARCH; breakdown: arm64=272, armhf=76,
riscv64=15, amd64=3, loong64=1. Smoke-tested with a targets.yaml
carrying skip-arches: [loong64, riscv64] — compositor drops 17
entries cleanly, no leakage of filtered arches in final output.

userspace inventory has its own internal arch filtering via the
existing 'arches:' key and is not affected.

Author: igorpecovnik

config/boards/aml-t95z-plus.tvb

@@ -2,7 +2,8 @@
 BOARD_NAME="T95Z Plus"                          #  (a q201 Chinese clone with internal amlogic ethernet 1gbit, complete with a chunk of metal inside to delay thermal throttling)
 BOARD_VENDOR="amlogic"
 BOOT_FDT_FILE="amlogic/meson-gxm-t95z-plus.dtb" # From chewitt's patches
-BOARDFAMILY="meson-gxl"                         # s912's are actually meson-gxm, no harm done.
+BOARDFAMILY="meson-gxl"                         # s912s are actually meson-gxm, no harm done.
+ARCH="arm64"
 BOARD_VENDOR="generic"
 BOOTCONFIG="meson-gxm-t95z-plus_defconfig"      # patched-in
 BOARD_MAINTAINER=""

config/boards/ayn-odin2mini.csc

@@ -1,5 +1,6 @@
 # Qualcomm SM8550 octa core 8GB/12GB/16GB RAM SoC eMMC USB-C WiFi/BT
 source "${SRC}/config/boards/ayn-odin2.csc"
+declare -g ARCH="arm64"
 declare -g BOARD_NAME="Ayn Odin2 Mini"
 declare -g BOARD_VENDOR="ayntec"
 declare -g BOARD_MAINTAINER="Squishy123"

config/boards/ayn-odin2portal.csc

@@ -1,5 +1,6 @@
 # Qualcomm SM8550 octa core 8GB/12GB/16GB RAM SoC eMMC USB-C WiFi/BT
 source "${SRC}/config/boards/ayn-odin2.csc"
+declare -g ARCH="arm64"
 declare -g BOARD_NAME="Ayn Odin2 Portal"
 declare -g BOARD_VENDOR="ayntec"
 declare -g BOARD_MAINTAINER="Squishy123"

config/boards/ayn-thor.csc

@@ -1,5 +1,6 @@
 # Qualcomm SM8550 octa core 8GB/12GB/16GB RAM SoC eMMC USB-C WiFi/BT
 source "${SRC}/config/boards/ayn-odin2.csc"
+declare -g ARCH="arm64"
 declare -g BOARD_NAME="Ayn Thor"
 declare -g BOARD_VENDOR="ayntec"
 declare -g BOARD_MAINTAINER="Squishy123"

config/boards/gateway-dk.conf

@@ -2,6 +2,7 @@
 BOARD_NAME="Mono Gateway Development Kit"
 BOARD_VENDOR="mono"
 BOARDFAMILY="ls1046a"
+ARCH="arm64"
 BOARD_MAINTAINER="tomazzaman"
 BOOTCONFIG="mono_gateway_dk_defconfig"
 KERNEL_TARGET="current"

lib/tools/common/armbian_utils.py

@@ -15,6 +15,7 @@
 import multiprocessing
 import os
 import re
+import shlex
 import subprocess
 from pathlib import Path
 
@@ -350,6 +351,47 @@ def armbian_get_all_userspace_inventory():
 	return all_distros
 
 
+# ARCH is declared per-family in config/sources/families/<BOARDFAMILY>.conf —
+# but many families delegate to a shared include (e.g. meson-g12b.conf sources
+# meson64_common.inc which then sets ARCH=arm64). Rather than hand-write a
+# mini-bash to follow `source` directives, just bash-source the family file
+# in a throwaway subshell and print ARCH. Cache results per family — there
+# are ~60 unique families across ~370 boards.
+_family_arch_cache: dict = {}
+
+
+def armbian_get_arch_for_family(family_name, armbian_src_path):
+	"""Return the ARCH declared by config/sources/families/<family>.conf
+	(after resolving any `source` includes), or None if the file or the
+	ARCH declaration is missing. Result is cached per family."""
+	if not family_name:
+		return None
+	if family_name in _family_arch_cache:
+		return _family_arch_cache[family_name]
+	family_file = os.path.join(armbian_src_path, "config", "sources", "families", f"{family_name}.conf")
+	arch = None
+	if os.path.isfile(family_file):
+		# Set ARCH via the EXIT trap so we still capture it even if the
+		# family conf aborts mid-source via `${FOO:?error}` on a required
+		# var that wouldn't be set in this minimal context (ls1046a, etc).
+		bash_code = (
+			"( trap 'printf \"%s\" \"${ARCH:-}\"; exit 0' EXIT; "
+			"source " + shlex.quote(family_file) + " >/dev/null 2>&1 )"
+		)
+		try:
+			proc = subprocess.run(
+				["bash", "-c", bash_code],
+				capture_output=True, text=True, timeout=5, check=False,
+			)
+			value = (proc.stdout or "").strip()
+			if value and re.match(r"^[a-zA-Z0-9_]+$", value):
+				arch = value
+		except (subprocess.TimeoutExpired, OSError) as e:
+			log.debug(f"Could not resolve ARCH for family '{family_name}': {e}")
+	_family_arch_cache[family_name] = arch
+	return arch
+
+
 def armbian_get_all_boards_inventory():
 	armbian_paths = find_armbian_src_path()
 	core_boards = armbian_get_all_boards_list(armbian_paths["core_boards_path"])
@@ -379,6 +421,27 @@ def armbian_get_all_boards_inventory():
 				log.debug(f"Userpatched Board {uboard_name} is already in core boards")
 				info_for_board[uboard_name] = {**info_for_board[uboard_name], **uboard}
 
+	# Resolve ARCH per-board. Prefer an explicit board-level ARCH
+	# declaration (picked up by the generic board-file regex into
+	# BOARD_TOP_LEVEL_VARS); fall back to the family conf so boards
+	# that inherit their arch transitively (most of them) don't need
+	# the redundant declaration. Targets compositors use this to drop
+	# matrix invocations where board arch doesn't match the requested
+	# release's arch list (e.g. noble without loong64) instead of
+	# relying on compile.sh to reject the combo downstream.
+	for board, info in info_for_board.items():
+		top_vars = info.get("BOARD_TOP_LEVEL_VARS", {})
+		arch = top_vars.get("ARCH")
+		if not arch:
+			family = top_vars.get("BOARDFAMILY")
+			arch = armbian_get_arch_for_family(family, armbian_paths["armbian_src_path"])
+			if arch:
+				top_vars["ARCH"] = arch
+		if arch:
+			info["ARCH"] = arch
+		else:
+			log.warning(f"Could not resolve ARCH for board '{board}' (family '{top_vars.get('BOARDFAMILY')}')")
+
 	return info_for_board
 
 

lib/tools/info/targets-compositor.py

@@ -197,9 +197,10 @@ def get_userspace_inventory(opts: dict):
 	if "items-from-inventory" in target_obj:
 		# loop over the keys, for regular board vs branches inventory
 		for key in target_obj["items-from-inventory"]:
+			cfg = target_obj["items-from-inventory"][key]
 			to_add = []
 			if key == "userspace":
-				to_add.extend(get_userspace_inventory(target_obj["items-from-inventory"][key]))
+				to_add.extend(get_userspace_inventory(cfg))
 			elif key == "all":
 				to_add.extend(all_boards_all_branches)
 			elif key == "not-eos":
@@ -208,6 +209,43 @@ def get_userspace_inventory(opts: dict):
 				to_add.extend(not_eos_with_video_boards_all_branches)
 			else:
 				to_add.extend(boards_by_support_level_and_branches[key])
+
+			# For non-userspace inventory sources, honour optional
+			# skip-arches / only-arches filters declared on the
+			# inventory key. Example:
+			#   items-from-inventory:
+			#     not-eos-with-video:
+			#       skip-arches: [loong64, riscv64]
+			# Drops board entries whose ARCH matches skip-arches, or
+			# doesn't match only-arches. Board ARCH comes from the
+			# board/family conf (see armbian_utils.armbian_get_all_boards_inventory).
+			# userspace inventory has its own internal arch filtering
+			# via the `arches:` key and is not touched here.
+			if key != "userspace" and isinstance(cfg, dict):
+				skip_arches = set(cfg.get("skip-arches") or [])
+				only_arches_raw = cfg.get("only-arches")
+				only_arches = set(only_arches_raw) if only_arches_raw else None
+				if skip_arches or only_arches is not None:
+					before = len(to_add)
+					filtered = []
+					for bb in to_add:
+						board = bb.get("BOARD")
+						arch = board_inventory.get(board, {}).get("ARCH")
+						if arch is None:
+							log.warning(f"Cannot resolve ARCH for board '{board}'; keeping it")
+							filtered.append(bb)
+							continue
+						if only_arches is not None and arch not in only_arches:
+							continue
+						if arch in skip_arches:
+							continue
+						filtered.append(bb)
+					to_add = filtered
+					log.info(
+						f"Arch filter on '{key}' (skip={sorted(skip_arches)}, "
+						f"only={sorted(only_arches) if only_arches else None}): "
+						f"{before} → {len(to_add)}")
+
 			log.info(f"Adding '{key}' from inventory to target '{target_name}': {len(to_add)} targets")
 			all_items.extend(to_add)