Merge branch 'main' into desktop-to-armbian-config

Author: igorpecovnik

.github/workflows/maintenance-validate-board-configs.yml

@@ -0,0 +1,72 @@
+name: "Validate board configs"
+
+# Runs on PRs that touch config/boards/*. Validates only the changed
+# files (not all 500+) via tools/validate-board-config.py and emits
+# GitHub Actions annotations on the PR diff. Blocks merge on errors.
+
+on:
+  pull_request:
+    paths:
+      - "config/boards/**"
+      - "tools/validate-board-config.py"
+      - ".github/workflows/maintenance-validate-board-configs.yml"
+
+permissions:
+  contents: read
+  pull-requests: read
+
+jobs:
+  validate:
+    name: "Validate changed board configs"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout PR"
+        uses: actions/checkout@v4
+        with:
+          # Need the merge-base to compute changed files; depth 0 is
+          # heaviest but bulletproof. Most PRs are small enough this
+          # is fine; switch to fetch-depth: 2 + explicit base ref if
+          # repo size becomes a problem.
+          fetch-depth: 0
+
+      - name: "Set up Python"
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: "Collect changed board configs"
+        id: changed
+        run: |
+          set -euo pipefail
+          base="${{ github.event.pull_request.base.sha }}"
+          head="${{ github.event.pull_request.head.sha }}"
+
+          # Limit to known config-bearing extensions to avoid wasting CI
+          # cycles on README.md or other non-config files in the dir.
+          mapfile -t files < <(
+            git diff --name-only --diff-filter=ACMR "${base}" "${head}" -- 'config/boards/*.conf' 'config/boards/*.csc' 'config/boards/*.tvb' 'config/boards/*.wip' 'config/boards/*.eos'
+          )
+
+          echo "Changed board configs: ${#files[@]}"
+          printf '  %s\n' "${files[@]}"
+
+          # Output the list as a space-joined string for the next step.
+          # If empty, set a marker so we can short-circuit.
+          if [[ ${#files[@]} -eq 0 ]]; then
+            echo "files=" >> "$GITHUB_OUTPUT"
+          else
+            echo "files=${files[*]}" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: "Run validator"
+        if: steps.changed.outputs.files != ''
+        env:
+          FILES: ${{ steps.changed.outputs.files }}
+        run: |
+          set -euo pipefail
+          # shellcheck disable=SC2086
+          python3 tools/validate-board-config.py --github ${FILES}
+
+      - name: "No board configs changed"
+        if: steps.changed.outputs.files == ''
+        run: echo "No config/boards/*.{conf,csc,tvb,wip,eos} changes in this PR — nothing to validate."

extensions/gateway-dk-ask.sh

@@ -15,7 +15,7 @@
 # Source repos and refs (pinned to match Yocto)
 # For local testing: set ASK_REPO="file:///path/to/ASK" — the Docker mount hook below handles it
 declare -g ASK_REPO="https://github.com/we-are-mono/ASK.git"
-declare -g ASK_BRANCH="commit:252b6db5a274383917c7a7688c931d61409978c2"
+declare -g ASK_BRANCH="commit:a211ea865379362058c6656b9c448e4a7050e93c"
 declare -g FMLIB_REPO="https://github.com/nxp-qoriq/fmlib.git"
 declare -g FMLIB_COMMIT="7a58ecaf0d90d71d6b78d3ac7998282a472c4394"
 declare -g FMC_REPO="https://github.com/nxp-qoriq/fmc.git"
@@ -161,11 +161,13 @@ function post_install_kernel_debs__ask_module_autoload() {
 
 # Copy patches into chroot before patched library builds (runs before build_ask_userspace)
 function pre_customize_image__000_prepare_ask_patches() {
-	mkdir -p "${SDCARD}/tmp/ask-patches"
+	# Stage per-package trees (version subdirs preserved) so rebuild_patched_deb
+	# can pick the patch matching the upstream source version.
 	local patch_dirs=("libnetfilter-conntrack" "libnfnetlink")
 	for pdir in "${patch_dirs[@]}"; do
 		[[ -d "${ASK_CACHE_DIR}/patches/${pdir}" ]] || exit_with_error "ASK patch directory missing" "${ASK_CACHE_DIR}/patches/${pdir}"
-		cp "${ASK_CACHE_DIR}/patches/${pdir}/"*.patch "${SDCARD}/tmp/ask-patches/"
+		mkdir -p "${SDCARD}/tmp/ask-patches/${pdir}"
+		cp -a "${ASK_CACHE_DIR}/patches/${pdir}/." "${SDCARD}/tmp/ask-patches/${pdir}/"
 	done
 
 	# Enable deb-src for apt-get source (handles both Debian and Ubuntu)
@@ -409,8 +411,8 @@ Version: ${ask_version}
 Architecture: arm64
 Section: net
 Priority: optional
-Maintainer: Mono Technologies <support@mono.si>
-Depends: linux-image-${BRANCH}-${LINUXFAMILY} (>= ${kernel_ver}), libxml2, libpcap0.8, iptables
+Maintainer: Tomaz Zaman <tomaz@mono.si>
+Depends: linux-image-${BRANCH}-${LINUXFAMILY} (>= ${kernel_ver}), libxml2 | libxml2-16, libpcap0.8, iptables
 Description: NXP ASK hardware offloading userspace for Mono Gateway DK
  Userspace tools (fmlib, fmc, libfci, libcli, dpa-app, cmm) and configuration
  for NXP ASK data-plane acceleration on the LS1046A Gateway DK.
@@ -452,6 +454,9 @@ EOF
 /etc/cdx_pcd.xml
 /etc/cdx_sp.xml
 /etc/config/fastforward
+/etc/fmc/config/cfgdata.xsd
+/etc/fmc/config/hxs_pdl_v3.xml
+/etc/fmc/config/netpcd.xsd
 /etc/sysctl.d/99-ls1046a-conntrack.conf
 CONFFILES
 
@@ -461,7 +466,8 @@ CONFFILES
 	run_host_command_logged dpkg-deb -b "${pkgdir}" "${SRC}/output/debs/${debfile}" \
 		|| exit_with_error "dpkg-deb failed for ${debfile}"
 	cp "${SRC}/output/debs/${debfile}" "${SDCARD}/root/"
-	chroot_sdcard "dpkg -i /root/${debfile}" || exit_with_error "dpkg -i failed for ${debfile}"
+	chroot_sdcard "DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends /root/${debfile}" \
+		|| exit_with_error "apt install failed for ${debfile}"
 	rm -f "${SDCARD}/root/${debfile}"
 
 	rm -rf "${pkgdir}"
@@ -495,8 +501,12 @@ function build_ask_patched_libraries() {
 	rm -rf "${SDCARD}/tmp/ask-patched-debs"
 }
 
-# Helper: rebuild a Debian package with an ASK patch in an isolated chroot directory
+# Helper: rebuild a Debian package with an ASK patch in an isolated chroot directory.
 # Usage: rebuild_patched_deb <pkg_name> <patch_file> <deb_globs>
+# The patch is resolved under /tmp/ask-patches/<pkg>/<upstream_version>/<patch_file>,
+# where <upstream_version> is parsed from the source tree's debian/changelog after
+# apt-get source. This lets a single ASK repo cover multiple target distros whose
+# upstream library versions differ (e.g. Trixie/Noble 1.1.0 vs Resolute 1.1.1).
 function rebuild_patched_deb() {
 	local pkg="$1" patch="$2" debs="$3"
 	local workdir="/tmp/ask-rebuild-${pkg}"
@@ -507,7 +517,14 @@ function rebuild_patched_deb() {
 		rm -rf '${workdir}' && mkdir -p '${workdir}' && cd '${workdir}' && \
 		apt-get source '${pkg}' && \
 		cd \$(ls -d ${pkg}-*/ | head -1) && \
-		patch -p1 < '/tmp/ask-patches/${patch}' && \
+		upstream_ver=\$(dpkg-parsechangelog -l debian/changelog -S Version \
+			| sed -E 's/^[0-9]+://; s/-[^-]+\$//; s/^([0-9]+\\.[0-9]+\\.[0-9]+).*/\\1/') && \
+		patch_path=\"/tmp/ask-patches/${pkg}/\${upstream_ver}/${patch}\" && \
+		if [ ! -f \"\${patch_path}\" ]; then \
+			echo \"ERROR: no ASK patch for ${pkg} upstream \${upstream_ver} (looked for \${patch_path})\" >&2; \
+			exit 1; \
+		fi && \
+		patch -p1 < \"\${patch_path}\" && \
 		DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -b -uc -us && \
 		cd '${workdir}' && dpkg -i ${debs} && \
 		cp ${debs} /tmp/ask-patched-debs/ && \

extensions/grub-riscv64.sh

@@ -112,9 +112,17 @@ configure_grub() {
 	[[ -n "$SERIALCON" ]] &&
 		GRUB_CMDLINE_LINUX_DEFAULT+=" console=${SERIALCON}"
 
-	[[ "$BOOT_LOGO" == "yes" || "$BOOT_LOGO" == "desktop" && "$BUILD_DESKTOP" == "yes" ]] &&
-		GRUB_CMDLINE_LINUX_DEFAULT+=" quiet splash plymouth.ignore-serial-consoles i915.force_probe=* loglevel=3" ||
-		GRUB_CMDLINE_LINUX_DEFAULT+=" splash=verbose i915.force_probe=*"
+	# Kernel cmdline. Always pass the graphical-Plymouth flags
+	# regardless of whether this image is being built as CLI or
+	# desktop — same reasoning as in extensions/grub.sh: users
+	# add a desktop later via armbian-config and we can't
+	# regenerate grub.cfg from there. Plymouth handles the
+	# "no theme installed" / "no DRM" cases gracefully.
+	# (No i915.force_probe here — that's an x86 Intel-graphics
+	# driver knob and is meaningless on riscv64. No 'quiet' /
+	# 'loglevel=3' either: kernel boot messages stay visible
+	# underneath the splash so users can see what's happening.)
+	GRUB_CMDLINE_LINUX_DEFAULT+=" splash plymouth.ignore-serial-consoles"
 
 	# Enable Armbian Wallpaper on GRUB
 	if [[ "${VENDOR}" == Armbian ]]; then
@@ -135,7 +143,7 @@ configure_grub() {
 		GRUB_DISTRIBUTOR="${UEFI_GRUB_DISTRO_NAME}"              # On GRUB menu will show up as "Armbian GNU/Linux" (will show up in some UEFI BIOS boot menu (F8?) as "armbian", not on others)
 		GRUB_DISABLE_OS_PROBER=false                             # Have to be explicit about enabling os-prober
 		GRUB_GFXMODE=1024x768
-		GRUB_GFXPAYLOAD=keep
+		GRUB_GFXPAYLOAD_LINUX=text                               # See extensions/grub.sh — correct var name is GRUB_GFXPAYLOAD_LINUX, not GRUB_GFXPAYLOAD, and 'text' disables Ubuntu's vt.handoff=7 injection.
 		GRUB_DISABLE_UUID=false  								 # Be explicit about wanting UUID
 		GRUB_DISABLE_LINUX_UUID=false  							 # Be explicit about wanting UUID
 	grubCfgFrag

extensions/grub.sh

@@ -265,9 +265,29 @@ configure_grub() {
 	[[ -n "$SERIALCON" ]] &&
 		GRUB_CMDLINE_LINUX_DEFAULT+=" console=${SERIALCON}"
 
-	[[ "$BOOT_LOGO" == "yes" || "$BOOT_LOGO" == "desktop" && "$BUILD_DESKTOP" == "yes" ]] &&
-		GRUB_CMDLINE_LINUX_DEFAULT+=" quiet splash plymouth.ignore-serial-consoles i915.force_probe=* loglevel=3" ||
-		GRUB_CMDLINE_LINUX_DEFAULT+=" splash=verbose i915.force_probe=*"
+	# Kernel cmdline. We always pass the graphical-Plymouth flags
+	# (splash plymouth.ignore-serial-consoles) on UEFI x86,
+	# regardless of whether this image is being built as CLI or
+	# desktop. Two reasons:
+	#   1. Users routinely add a desktop later via armbian-config
+	#      and we don't want that to require regenerating grub.cfg.
+	#      The .cfg is baked once at image-build time and stays
+	#      put across desktop installs.
+	#   2. Plymouth handles the "no theme installed" / "no DRM"
+	#      cases gracefully — the flags are harmless on a CLI
+	#      install. They are NOT harmless when wrong: the previous
+	#      'splash=verbose' value was rejected by the kernel
+	#      ("Unknown kernel command line parameters splash=verbose"
+	#      in dmesg) AND interpreted by Plymouth as "render the
+	#      verbose/text theme", so a desktop installed later still
+	#      booted to a black/text screen.
+	#
+	# Deliberately NO 'quiet' and NO 'loglevel=3' here. Plymouth
+	# still draws the splash on top of the kernel boot messages,
+	# but the messages remain visible underneath so users can see
+	# what their system is doing. Press Esc during boot to drop
+	# the splash and read the messages directly.
+	GRUB_CMDLINE_LINUX_DEFAULT+=" splash plymouth.ignore-serial-consoles i915.force_probe=*"
 
 	# Enable Armbian Wallpaper on GRUB
 	if [[ "${VENDOR}" == Armbian ]]; then
@@ -290,7 +310,7 @@ configure_grub() {
 		GRUB_DISABLE_SUBMENU=y                                   # Do not put all kernel options into a submenu, instead, list them all on the main menu.
 		GRUB_DISABLE_OS_PROBER=false                             # Have to be explicit about enabling os-prober
 		GRUB_FONT="/usr/share/grub/unicode.pf2"                  # Be explicit about the font to use so Ubuntu does not freak out and mess gfxterm
-		GRUB_GFXPAYLOAD=keep
+		GRUB_GFXPAYLOAD_LINUX=text                               # Note the correct var name is GRUB_GFXPAYLOAD_LINUX, not GRUB_GFXPAYLOAD (the latter is silently ignored). The 'text' value disables Ubuntu's vt.handoff=7 injection: Ubuntu's grub2 10_linux only expands 'vt.handoff=7' inside grub.cfg's gfxmode function when the gfxpayload arg is exactly 'keep'. Setting it to 'text' makes the runtime check fail and the framebuffer console stays bound to fbcon for the entire userspace lifetime — which is what we want, otherwise after Plymouth quits on a CLI install (or after the user uninstalls the desktop), the kernel hands the framebuffer to VT7 waiting for an X server, nothing ever claims it, and the local console goes black even though getty@tty1 is running.
 		GRUB_DISABLE_UUID=false  								 # Be explicit about wanting UUID
 		GRUB_DISABLE_LINUX_UUID=false  							 # Be explicit about wanting UUID
 	grubCfgFrag

extensions/uboot-binman-fix-pkg-resources.sh

@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-2.0
+#
+# Copyright (c) 2013-2026 Igor Pecovnik, igor@armbian.com
+#
+# This file is a part of the Armbian Build Framework
+# https://github.com/armbian/build/
+#
+# Fix binman's use of pkg_resources (removed in setuptools >= 82)
+# by migrating to importlib.resources.
+#
+# Safe for all U-Boot versions: no-op if pkg_resources is not used.
+# Can be removed once all BOOTBRANCH versions are >= v2025.10.
+
+function pre_config_uboot_target__fix_binman_pkg_resources() {
+	local control_py="tools/binman/control.py"
+
+	# Skip if file doesn't exist or doesn't use pkg_resources
+	[[ -f "${control_py}" ]] || return 0
+	grep -q 'import pkg_resources' "${control_py}" || return 0
+
+	display_alert "Patching binman" "migrating pkg_resources to importlib.resources" "info"
+
+	python3 << 'PYTHON_SCRIPT'
+import re
+
+control_py = "tools/binman/control.py"
+
+with open(control_py, "r") as f:
+    content = f.read()
+
+# 1. Remove "import pkg_resources" line
+content = re.sub(r'^import pkg_resources\b[^\n]*\n', '', content, flags=re.MULTILINE)
+
+# 2. Ensure importlib_resources alias is available
+has_importlib_alias = 'importlib_resources' in content
+has_importlib_dotted = re.search(r'^import importlib\.resources\s*$', content, flags=re.MULTILINE)
+
+if not has_importlib_alias and has_importlib_dotted:
+    # New U-Boot (v2024.01+): has "import importlib.resources" without alias
+    content = re.sub(
+        r'^import importlib\.resources\s*$',
+        'import importlib.resources as importlib_resources',
+        content, count=1, flags=re.MULTILINE
+    )
+    # Update existing dotted usage to use the alias
+    content = re.sub(r'\bimportlib\.resources\.', 'importlib_resources.', content)
+elif not has_importlib_alias:
+    # Old U-Boot (<=v2023.x): no importlib.resources at all
+    import_block = (
+        'try:\n'
+        '    import importlib.resources as importlib_resources\n'
+        '    importlib_resources.files\n'
+        'except (ImportError, AttributeError):\n'
+        '    import importlib_resources\n'
+    )
+    # Insert after the last top-level import line
+    lines = content.split('\n')
+    last_import_idx = 0
+    for i, line in enumerate(lines):
+        if re.match(r'^(?:import |from \S+ import )', line):
+            last_import_idx = i
+    lines.insert(last_import_idx + 1, import_block)
+    content = '\n'.join(lines)
+
+# 3. Replace pkg_resources.resource_string(__name__, X)
+#    with importlib_resources.files(__package__).joinpath(X).read_bytes()
+content = re.sub(
+    r'pkg_resources\.resource_string\s*\(\s*__name__\s*,\s*(.+?)\s*\)',
+    r'importlib_resources.files(__package__).joinpath(\1).read_bytes()',
+    content
+)
+
+# 4. Replace pkg_resources.resource_listdir(__name__, X)
+#    with [r.name for r in importlib_resources.files(__package__).joinpath(X).iterdir() if r.is_file()]
+content = re.sub(
+    r'pkg_resources\.resource_listdir\s*\(\s*__name__\s*,\s*(.+?)\s*\)',
+    r'[r.name for r in importlib_resources.files(__package__).joinpath(\1).iterdir() if r.is_file()]',
+    content
+)
+
+with open(control_py, "w") as f:
+    f.write(content)
+
+print("binman control.py patched successfully")
+PYTHON_SCRIPT
+}

lib/functions/artifacts/artifact-armbian-base-files.sh

@@ -168,6 +168,25 @@ function compile_armbian-base-files() {
 	sed -i "s|^PRIVACY_POLICY_URL=.*|PRIVACY_POLICY_URL=\"${VENDORPRIVACY}\"|" "${destination}"/etc/os-release
 	sed -i "s|^LOGO=.*|LOGO=\"${VENDORLOGO}\"|" "${destination}"/etc/os-release
 
+	# Replace Ubuntu logo files with symlinks to Armbian's.
+	# Ubuntu hardcodes lookups for ubuntu-logo*.svg / ubuntu-logo*.png
+	# in GNOME Settings → About and other places. The Armbian logos
+	# are shipped by armbian-bsp-cli (packages/bsp/common/usr/share/
+	# pixmaps/armbian-logo*). Since we own this base-files repack,
+	# we can safely replace the upstream files with relative symlinks.
+	if [[ -d "${destination}/usr/share/pixmaps" ]]; then
+		for suffix in ".svg" "-text.png" "-text-dark.png" "-text.svg" "-text-dark.svg"; do
+			# Only replace files actually present in the upstream
+			# base-files payload — don't create symlinks for variants
+			# that don't exist in this release.
+			local upstream="${destination}/usr/share/pixmaps/ubuntu-logo${suffix}"
+			if [[ -f "${upstream}" ]]; then
+				rm -f "${upstream}"
+				ln -sf "armbian-logo${suffix}" "${upstream}"
+			fi
+		done
+	fi
+
 	# Remove content from motd: Ubuntu header, welcome text and news. We have our own
 	rm -f "${destination}"/etc/update-motd.d/00-header
 	sed -i "\/etc\/update-motd.d\/00-header/d" "${destination}/DEBIAN/conffiles"

lib/functions/artifacts/artifact-kernel.sh

@@ -125,7 +125,7 @@ function artifact_kernel_prepare_version() {
 
 	# run the extensions. they _must_ behave, and not try to modify the .config, instead just fill kernel_config_modifying_hashes
 	declare kernel_config_modifying_hashes_hash="undetermined"
-	declare -a kernel_config_modifying_hashes=()
+	declare -ga kernel_config_modifying_hashes=()
 	call_extensions_kernel_config
 	# Reduce to last assignment per key to keep hashing stable and ignore overridden options.
 	# tac reverses order so last becomes first, then sort -uk keeps first occurrence of each key.

lib/functions/compilation/armbian-kernel.sh

@@ -616,6 +616,7 @@ function kernel_config_set_m() {
 	declare module="$1"
 	display_alert "Enabling kernel module" "${module}=m" "debug"
 	run_host_command_logged ./scripts/config --module "${module}"
+	kernel_config_modifying_hashes+=("${module}=m")
 }
 
 # Sets a kernel configuration option to be built-in (=y).
@@ -627,6 +628,7 @@ function kernel_config_set_y() {
 	declare config="$1"
 	display_alert "Enabling kernel config/built-in" "${config}=y" "debug"
 	run_host_command_logged ./scripts/config --enable "${config}"
+	kernel_config_modifying_hashes+=("${config}=y")
 }
 
 # Disables a kernel configuration option (=n).
@@ -637,6 +639,7 @@ function kernel_config_set_n() {
 	declare config="$1"
 	display_alert "Disabling kernel config/module" "${config}=n" "debug"
 	run_host_command_logged ./scripts/config --disable "${config}"
+	kernel_config_modifying_hashes+=("${config}=n")
 }
 
 # Sets a kernel configuration option to a string value.
@@ -649,6 +652,7 @@ function kernel_config_set_string() {
 	declare value="${2}"
 	display_alert "Setting kernel config/module string" "${config}=${value}" "debug"
 	run_host_command_logged ./scripts/config --set-str "${config}" "${value}"
+	kernel_config_modifying_hashes+=("${config}=\"${value}\"")
 }
 
 # Sets a kernel configuration option to a numeric or hexadecimal value.
@@ -661,6 +665,7 @@ function kernel_config_set_val() {
 	declare value="${2}"
 	display_alert "Setting kernel config/module value" "${config}=${value}" "debug"
 	run_host_command_logged ./scripts/config --set-val "${config}" "${value}"
+	kernel_config_modifying_hashes+=("${config}=${value}")
 }
 
 # Applies kernel configuration options from arrays to hashes and the .config file.