diff --git a/board-images/nanopi-m6v2.png b/board-images/nanopi-m6v2.png new file mode 100644 index 0000000000..9fe03c4dc1 Binary files /dev/null and b/board-images/nanopi-m6v2.png differ diff --git a/release-targets/reusable.yml b/release-targets/reusable.yml index 03f32d62db..7a78b8f92f 100644 --- a/release-targets/reusable.yml +++ b/release-targets/reusable.yml @@ -291,3 +291,15 @@ boards: uses: "nanopct6-lts" branch: "current" file_extension: "img.xz" + + - board_slug: "nanopi-m6v2" + board_name: "NanoPi M6 V2" + board_vendor: "friendlyelec" + board_support: "conf" + board_introduced: "2026" + + # The magic: reuse artifact set. The M6V2 has no dedicated build - it ships + # on the unified "nanopi6-series" image (R6S/R6C/M6/M6V2), see armbian/build#10442. + uses: "nanopi6-series" + branch: "current,vendor" + file_extension: "img.xz" diff --git a/scripts/generate-armbian-images-json.sh b/scripts/generate-armbian-images-json.sh index 300d6a3759..9d5d207a6f 100755 --- a/scripts/generate-armbian-images-json.sh +++ b/scripts/generate-armbian-images-json.sh @@ -840,8 +840,10 @@ cat "$tmpdir/a.txt" "$tmpdir/bcd.txt" >"$feed" branch_filter="${REUSABLE_BOARD_BRANCH[$reusable_slug]:-}" ext_filter="${REUSABLE_BOARD_EXT[$reusable_slug]:-}" - # Apply branch filter if specified - if [[ -n "$branch_filter" && "$BRANCH" != "$branch_filter" ]]; then + # Apply branch filter if specified. Accepts a comma-separated list + # (e.g. "current,vendor") — include the image if its branch is any of + # them. A single value keeps its original exact-match behaviour. + if [[ -n "$branch_filter" && ",${branch_filter//[[:space:]]/}," != *",${BRANCH},"* ]]; then continue fi