Skip to content

Commit a6a0376

Browse files
kevinelliottclaude
andcommitted
boards: bump Armbian pin to v26.5.1 + add 10 tier4 boards
Bumps the Armbian build framework pin from v26.2.1 to v26.5.1, which fixes the mainline-kernel archive patch drift that blocked the sunxi (Allwinner) and mainline-rockchip (rk3399/rk3568/rk3328) families at v26.2.1. Validated by canaries on v26.5.1: orangepizero3 (sunxi, was blocked) and rock-5b (rk3588 vendor, regression check) both build clean; rock-3a (rk3568) past the patch-apply gate. Adds tier 4 (next-most-popular arm64 boards), selected for popularity + SoC/vendor spread and each verified against the Armbian v26.5.1 board configs: vendor (rk3588/rk3588s): nanopct6-lts, nanopi-m6, orangepi5pro current (rk3399): rockpi-4b, rockpro64 current (rk3568): nanopi-r5s current (rk3328): nanopi-r2s current (Allwinner H616): orangepizero2 current (Amlogic): khadas-vim3l, bananapim5 targets.yaml tier4-boards (wired into cli-trixie), build-image-simple board choices, and flasher gen-catalog DEVICES/SHORT updated. With the pin bump the 7 previously-blocked tier2/3 boards also become buildable. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 2797b73 commit a6a0376

4 files changed

Lines changed: 48 additions & 1 deletion

File tree

.github/workflows/build-image-simple.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,16 @@ on:
3434
- orangepizero2w
3535
- nanopi-r4s
3636
- orangepi4-lts
37+
- nanopct6-lts
38+
- nanopi-m6
39+
- orangepi5pro
40+
- rockpi-4b
41+
- rockpro64
42+
- nanopi-r5s
43+
- nanopi-r2s
44+
- orangepizero2
45+
- khadas-vim3l
46+
- bananapim5
3747
release:
3848
description: "Release"
3949
required: true

armbian/build.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ set -euo pipefail
44
# Airwaves OS Build Script
55
# Clones armbian/build at a pinned tag and runs compile with our userpatches.
66

7-
ARMBIAN_BUILD_TAG="${ARMBIAN_BUILD_TAG:-v26.2.1}"
7+
# v26.5.1: bumped from v26.2.1 to fix mainline-kernel archive patch drift that
8+
# blocked the sunxi (Allwinner) and mainline-rockchip (rk3399/rk3568/rk3328)
9+
# boards — at v26.2.1 the verisilicon-AV1 / megous usb-gadget patches failed to
10+
# apply and Armbian's prebuilt kernel was absent from the OCI cache, forcing a
11+
# from-source build that aborted. v26.5.1's archive patches match the kernel tags
12+
# (validated: sunxi orangepizero3 + vendor rock-5b canaries build clean).
13+
ARMBIAN_BUILD_TAG="${ARMBIAN_BUILD_TAG:-v26.5.1}"
814
ARMBIAN_BUILD_DIR="${ARMBIAN_BUILD_DIR:-.armbian-build}"
915
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
1016

armbian/userpatches/targets.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,23 @@ lists:
6969
- { BOARD: nanopi-r4s, BRANCH: current } # FriendlyELEC NanoPi R4S (rk3399)
7070
- { BOARD: orangepi4-lts, BRANCH: current } # Orange Pi 4 LTS (rk3399)
7171

72+
# Tier 4: Next-most-popular arm64 boards (added with the Armbian v26.5.1 pin
73+
# bump, which unblocks the mainline-rockchip + sunxi families that drifted at
74+
# v26.2.1). rk3588/rk3588s -> vendor (Rockchip BSP); rk3399/rk3568/rk3328/
75+
# Allwinner/Amlogic -> current (mainline). Branches per each board's Armbian
76+
# KERNEL_TARGET at v26.5.1.
77+
tier4-boards: &tier4-boards
78+
- { BOARD: nanopct6-lts, BRANCH: vendor } # FriendlyELEC NanoPC-T6 LTS (rk3588)
79+
- { BOARD: nanopi-m6, BRANCH: vendor } # FriendlyELEC NanoPi M6 (rk3588s)
80+
- { BOARD: orangepi5pro, BRANCH: vendor } # Orange Pi 5 Pro (rk3588s)
81+
- { BOARD: rockpi-4b, BRANCH: current } # Radxa ROCK Pi 4B (rk3399)
82+
- { BOARD: rockpro64, BRANCH: current } # Pine64 RockPro64 (rk3399)
83+
- { BOARD: nanopi-r5s, BRANCH: current } # FriendlyELEC NanoPi R5S (rk3568)
84+
- { BOARD: nanopi-r2s, BRANCH: current } # FriendlyELEC NanoPi R2S (rk3328)
85+
- { BOARD: orangepizero2, BRANCH: current } # Orange Pi Zero 2 (Allwinner H616)
86+
- { BOARD: khadas-vim3l, BRANCH: current } # Khadas VIM3L (Amlogic S905D3)
87+
- { BOARD: bananapim5, BRANCH: current } # Banana Pi M5 (Amlogic S905X3)
88+
7289
targets:
7390

7491
# Primary: Debian Trixie for ARM and x86 boards
@@ -85,6 +102,7 @@ targets:
85102
- *tier1-boards
86103
- *tier2-boards
87104
- *tier3-boards
105+
- *tier4-boards
88106

89107
# Legacy: Debian Bookworm (community support in Armbian v26.2)
90108
cli-bookworm:

flasher/gen-catalog.mjs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,26 @@ const DEVICES = {
5454
orangepizero2w: { name: 'Orange Pi Zero 2W', description: 'Tiny Allwinner H618 board, Pi-Zero form factor.', icon: 'orangepi',arch: 'arm64', vendor: 'Orange Pi', tags: ['supported'] },
5555
'nanopi-r4s': { name: 'FriendlyELEC NanoPi R4S', description: 'RK3399 router/feeder with dual GbE.', icon: 'sbc', arch: 'arm64', vendor: 'FriendlyELEC', tags: ['supported'] },
5656
'orangepi4-lts': { name: 'Orange Pi 4 LTS', description: 'RK3399 board with Wi-Fi and eMMC.', icon: 'orangepi',arch: 'arm64', vendor: 'Orange Pi', tags: ['supported'] },
57+
// Tier 4
58+
'nanopct6-lts': { name: 'FriendlyELEC NanoPC-T6 LTS', description: 'Flagship RK3588 board: up to 32GB RAM, dual 2.5GbE, M.2 NVMe and USB3. A powerful multi-SDR feeder host.', icon: 'sbc', arch: 'arm64', vendor: 'FriendlyELEC', tags: ['supported'] },
59+
'nanopi-m6': { name: 'FriendlyELEC NanoPi M6', description: 'Pi-form-factor RK3588S board with 2.5GbE, M.2 and USB3. Low-cost high-performance feeder.', icon: 'sbc', arch: 'arm64', vendor: 'FriendlyELEC', tags: ['supported'] },
60+
orangepi5pro: { name: 'Orange Pi 5 Pro', description: 'Refined RK3588S board, up to 32GB RAM with M.2 NVMe, USB3 and Wi-Fi. Excellent multi-dongle feeder.', icon: 'orangepi', arch: 'arm64', vendor: 'Orange Pi', tags: ['supported'] },
61+
'rockpi-4b': { name: 'Radxa ROCK Pi 4B', description: 'Classic RK3399 board with true USB 3.0, GbE and Wi-Fi/BT. A perennial favourite ADS-B/SDR feeder.', icon: 'rock', arch: 'arm64', vendor: 'Radxa', tags: ['supported'] },
62+
rockpro64: { name: 'Pine64 RockPro64', description: 'RK3399 workhorse with USB 3.0, GbE and a PCIe x4 slot. Plenty of clean USB3 bandwidth for multi-dongle feeds.', icon: 'sbc', arch: 'arm64', vendor: 'Pine64', tags: ['supported'] },
63+
'nanopi-r5s': { name: 'FriendlyELEC NanoPi R5S', description: 'Fanless RK3568 mini box with dual 2.5GbE + GbE. Low-power always-on feeder host.', icon: 'sbc', arch: 'arm64', vendor: 'FriendlyELEC', tags: ['supported'] },
64+
'nanopi-r2s': { name: 'FriendlyELEC NanoPi R2S', description: 'Tiny RK3328 router board with GbE + USB3 GbE. Inexpensive headless always-on feeder.', icon: 'sbc', arch: 'arm64', vendor: 'FriendlyELEC', tags: ['supported'] },
65+
orangepizero2: { name: 'Orange Pi Zero 2', description: 'Tiny, cheap Allwinner H616 board with GbE. The budget single-dongle ADS-B/ACARS feeder.', icon: 'orangepi', arch: 'arm64', vendor: 'Orange Pi', tags: ['supported'] },
66+
'khadas-vim3l': { name: 'Khadas VIM3L', description: 'Fanless Amlogic S905D3 board with GbE, M.2 and USB3. Low-cost feeder with first-class mainline support.', icon: 'sbc', arch: 'arm64', vendor: 'Khadas', tags: ['supported'] },
67+
bananapim5: { name: 'Banana Pi M5', description: 'Amlogic S905X3 board with GbE and 4x USB3. Cheap, widely-stocked Pi-alternative feeder.', icon: 'sbc', arch: 'arm64', vendor: 'Banana Pi', tags: ['supported'] },
5768
};
5869
const SHORT = {
5970
rpi4b: 'Raspberry Pi', 'uefi-x86': 'x86 UEFI', 'rock-5b': 'ROCK 5B', 'rock-5a': 'ROCK 5A', orangepi5: 'Orange Pi 5', 'orangepi5-plus': 'Orange Pi 5 Plus',
6071
'rock-5c': 'ROCK 5C', 'rock-5b-plus': 'ROCK 5B+', nanopct6: 'NanoPC-T6', 'nanopi-r6s': 'NanoPi R6S', odroidn2: 'Odroid N2', odroidc4: 'Odroid C4',
6172
orangepizero3: 'Orange Pi Zero 3', 'orangepi3-lts': 'Orange Pi 3 LTS', lepotato: 'Le Potato', 'khadas-vim3': 'Khadas VIM3',
6273
'rock-5t': 'ROCK 5T', 'orangepi5-max': 'Orange Pi 5 Max', orangepi3b: 'Orange Pi 3B', 'radxa-zero3': 'Radxa ZERO 3W', 'rock-3a': 'ROCK 3A',
6374
odroidm1: 'Odroid M1', odroidc2: 'Odroid C2', orangepizero2w: 'Orange Pi Zero 2W', 'nanopi-r4s': 'NanoPi R4S', 'orangepi4-lts': 'Orange Pi 4 LTS',
75+
'nanopct6-lts': 'NanoPC-T6 LTS', 'nanopi-m6': 'NanoPi M6', orangepi5pro: 'Orange Pi 5 Pro', 'rockpi-4b': 'ROCK Pi 4B', rockpro64: 'RockPro64',
76+
'nanopi-r5s': 'NanoPi R5S', 'nanopi-r2s': 'NanoPi R2S', orangepizero2: 'Orange Pi Zero 2', 'khadas-vim3l': 'Khadas VIM3L', bananapim5: 'Banana Pi M5',
6477
};
6578
const CODENAME = 'Sideband';
6679
// No shell: args passed directly to gh (all inputs are constants anyway).

0 commit comments

Comments
 (0)