Merge remote-tracking branch 'armbian/main'

.github/workflows/forked-helper.yml

@@ -9,20 +9,18 @@ on:
   workflow_dispatch:
 
 jobs:
-  fork-repository-dispatch:
-    name: 📢 Run repository dispatch to default fork branch
-    if: ${{ github.repository_owner != 'armbian' }}
+  dispatch-on-forked-repo:
+    name: 📢 Run repository dispatch on fork
+    env:
+      DISPATCH_SECRET: ${{ secrets.ARMBIAN_SELF_DISPATCH_TOKEN }}
+    if: ${{ github.repository_owner != 'armbian' }} # Run only on forks
     runs-on: ubuntu-latest
     steps:
-      - name: Assign secret
-        id: get_dispatch_secret
-        run: echo "dispatch_secret=${{ secrets.ARMBIAN_SELF_DISPATCH_TOKEN }}" >> $GITHUB_OUTPUT
-
-      - name: Dispatch event on forked repostitory
-        if: steps.get_dispatch_secret.outputs.dispatch_secret
+      - name: Dispatch event on forked repository
+        if: ${{ env.DISPATCH_SECRET != '' }}  # Check that the secret has been set, if not, exit
         uses: peter-evans/repository-dispatch@v3
         with:
-          token: ${{ steps.get_dispatch_secret.outputs.dispatch_secret }}
+          token: ${{ env.DISPATCH_SECRET }}
           repository: ${{ github.repository }}
           event-type: armbian
           client-payload: >

.github/workflows/pr-announce.yml

@@ -1,10 +1,13 @@
 on:
   pull_request:
+    types: [ opened ]
     branches: [ main ]
 
 jobs:
   build:
+    name: "Announce PR on Discord"
     runs-on: ubuntu-latest
+    if: github.repository == 'armbian/build'
     steps:
       - name: Get repo
         uses: actions/checkout@v4
@@ -15,4 +18,4 @@ jobs:
           curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X POST --data \
           "{\"username\": \"Github\", \"avatar_url\": \"${{ secrets.AVATARURL }}\", \"content\": \"\
           :arrow_heading_up: **Pull request** to [$GITHUB_REPOSITORY](<$GITHUB_SERVER_URL/$GITHUB_REPOSITORY>) by [$GITHUB_ACTOR](<$GITHUB_SERVER_URL/$GITHUB_ACTOR>) - **Please review!** \
-          :point_right: [Link](<$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$GITHUB_SHA>): *$(git show -s --format=%s)*\"}" ${{ secrets.WEBHOOKURL }}
+          :point_right: [Link](<$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/${{github.event.pull_request.number}}>): *$(git show -s --format=%s)*\"}" ${{ secrets.WEBHOOKURL }}

.github/workflows/scorecard.yml

@@ -52,7 +52,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
         with:
           name: SARIF file
           path: results.sarif

README.md

@@ -26,7 +26,7 @@
 - Superuser rights (configured sudo or root access).
 - Make sure your system is up-to-date! Outdated Docker binaries, for example, can cause trouble.
 
-For stable branch use `--branch=v24.05`
+For stable branch use `--branch=v24.08`
 
 ```bash
 apt-get -y install git

VERSION

@@ -1 +1 @@
-24.8.0-trunk
+24.11.0-trunk

config/boards/armsom-sige7.csc

@@ -3,7 +3,7 @@ BOARD_NAME="ArmSoM Sige7"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="Z-Keven"
 BOOTCONFIG="armsom-sige7-rk3588_defconfig"
-KERNEL_TARGET="vendor,edge,collabora"
+KERNEL_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-armsom-sige7.dtb"

config/boards/bananapi.csc → config/boards/bananapi.conf

@@ -1,7 +1,7 @@
 # Allwinner A20 dual core 1Gb RAM SoC 1xSATA GBE
 BOARD_NAME="Banana Pi"
 BOARDFAMILY="sun7i"
-BOARD_MAINTAINER="DylanHP"
+BOARD_MAINTAINER="janprunk"
 BOOTCONFIG="Bananapi_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 

config/boards/bananapim7.conf

@@ -4,5 +4,6 @@ BOARD_MAINTAINER="amazingfate"
 BOOT_FDT_FILE="rockchip/rk3588-bananapi-m7.dtb"
 # Those are included in armsom-sige7.csc, but this file is parsed directly by the JSON matrix generator and thus those need to be in here
 BOARD_MAINTAINER="Z-Keven"
-KERNEL_TARGET="vendor,edge,collabora"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current,edge"
 BOARDFAMILY="rockchip-rk3588"

config/boards/clearfogpro.csc

@@ -5,4 +5,4 @@ BOARD_MAINTAINER=""
 BOOTCONFIG="clearfog_defconfig"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"

config/boards/gateway-gz80x.conf

@@ -0,0 +1,28 @@
+# Amlogic A113X quad core 1Gb RAM SoC, eMMC 8Gb
+BOARD_NAME="Gateway GZ80X"
+BOARDFAMILY="meson-axg"
+BOARD_MAINTAINER="pyavitz"
+BOOTCONFIG="alfredsmart_gateway_gz80x_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current,edge"
+BOOTBRANCH_BOARD="tag:v2023.10"
+BOOTPATCHDIR="v2023.10"
+BOOT_FDT_FILE="amlogic/meson-axg-alfredsmart-gateway-gz80x.dtb"
+SRC_EXTLINUX="yes"
+SRC_CMDLINE="console=ttyAML0,115200n8 clk_ignore_unused loglevel=7"
+HAS_VIDEO_OUTPUT="no"
+
+function post_config_uboot_target__extra_configs_for_gateway_gz80x() {
+	display_alert "u-boot for ${BOARD}" "u-boot: enabling extra configs" "info"
+
+	run_host_command_logged scripts/config --enable CONFIG_SD_BOOT
+	run_host_command_logged scripts/config --enable CONFIG_EXT4_WRITE
+	run_host_command_logged scripts/config --enable CONFIG_FS_BTRFS
+	run_host_command_logged scripts/config --enable CONFIG_CMD_BTRFS
+}
+
+function post_family_tweaks_bsp__gateway_gz80x_udev() {
+	mkdir -p "${destination}"/etc/udev/rules.d
+	display_alert "$BOARD" "Install zwave udev rule" "info"
+	echo 'KERNEL=="ttyAML2", NAME="tts/%n", SYMLINK+="zwave", GROUP="dialout", MODE="0660"' > "${destination}"/etc/udev/rules.d/10-zwave.rules
+}

config/boards/indiedroid-nova.csc

@@ -4,7 +4,7 @@ declare -g BOARD_MAINTAINER="lanefu"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOOTCONFIG="indiedroid_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 declare -g BOOT_SOC="rk3588"
-declare -g KERNEL_TARGET="vendor,collabora,edge"
+declare -g KERNEL_TARGET="vendor,current,edge"
 declare -g FULL_DESKTOP="yes"
 declare -g BOOT_LOGO="desktop"
 declare -g BOOT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb"

config/boards/jethubj100.conf

@@ -5,4 +5,7 @@ BOARD_MAINTAINER="adeepn"
 BOOTCONFIG="jethub_j100_defconfig"
 KERNEL_TARGET="current,edge"
 PACKAGE_LIST_BOARD="libubootenv-tool apparmor rfkill bluetooth bluez bluez-tools python3-pip watchdog python3-serial python3-intelhex python3-intelhex"
+[[ "${RELEASE}" == "jammy" ]] || PACKAGE_LIST_BOARD="${PACKAGE_LIST_BOARD} util-linux-extra"
 DEFAULT_CONSOLE="serial"
+HAS_VIDEO_OUTPUT="no"
+MODULES_BLACKLIST="rtw88_8822cs"

config/boards/jethubj200.conf

@@ -4,6 +4,8 @@ BOARDFAMILY="jethub"
 BOARD_MAINTAINER="adeepn"
 BOOTCONFIG="jethub_j200_defconfig"
 KERNEL_TARGET="current,edge"
+PACKAGE_LIST_BOARD="libubootenv-tool apparmor rfkill bluetooth bluez bluez-tools python3-pip watchdog"
+[[ "${RELEASE}" == "jammy" ]] || PACKAGE_LIST_BOARD="${PACKAGE_LIST_BOARD} util-linux-extra"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"

config/boards/jethubj80.conf

@@ -5,4 +5,7 @@ BOARD_MAINTAINER="adeepn"
 BOOTCONFIG="jethub_j80_defconfig"
 KERNEL_TARGET="current,edge"
 PACKAGE_LIST_BOARD="libubootenv-tool apparmor rfkill bluetooth bluez bluez-tools python3-pip watchdog python3-serial python3-intelhex python3-intelhex"
+[[ "${RELEASE}" == "jammy" ]] || PACKAGE_LIST_BOARD="${PACKAGE_LIST_BOARD} util-linux-extra"
 DEFAULT_CONSOLE="serial"
+HAS_VIDEO_OUTPUT="no"
+MODULES_BLACKLIST="rtw88_8822cs"

config/boards/khadas-edge2.conf

@@ -1,10 +1,10 @@
 # Rockchip RK3588s 2GB-16GB GBE eMMC NVMe SATA USB3 WiFi
 declare -g BOARD_NAME="Khadas Edge2"
 declare -g BOARDFAMILY="rockchip-rk3588"
-declare -g BOARD_MAINTAINER="igorpecovnik"
+declare -g BOARD_MAINTAINER="efectn"
 declare -g BOOT_SOC="rk3588" # Just to avoid errors in rockchip64_commmon
-declare -g KERNEL_TARGET="vendor,edge"
-declare -g KERNEL_TEST_TARGET="vendor"
+declare -g KERNEL_TARGET="vendor,current,edge"
+declare -g KERNEL_TEST_TARGET="vendor,current"
 declare -g IMAGE_PARTITION_TABLE="gpt"
 declare -g BOOT_FDT_FILE="rockchip/rk3588s-khadas-edge2.dtb" # Specific to this board
 

config/boards/nanopc-cm3588-nas.csc

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="nanopc_cm3588_defconfig" # Enables booting from NVMe. Vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,current,edge,collabora"
+KERNEL_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"

config/boards/nanopct6.csc → config/boards/nanopct6.conf

@@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="Tonymac32"
 BOOTCONFIG="nanopc_t6_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,current,edge,collabora"
-KERNEL_TEST_TARGET="vendor,edge"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6.dtb"

config/boards/nanopi-r4s.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip64" # Used to be rk3399
 BOARD_MAINTAINER="Manouchehri"
 BOOTCONFIG="nanopi-r4s-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"
 DEFAULT_CONSOLE="serial"
 MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
 HAS_VIDEO_OUTPUT="no"

config/boards/nanopi-r5c.csc

@@ -12,7 +12,7 @@ FULL_DESKTOP="no"
 BOOT_LOGO="desktop"
 
 BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07/board_${BOARD}"
+BOOTPATCHDIR="v2024.07"
 BOOTCONFIG="nanopi-r5c-rk3568_defconfig"
 
 OVERLAY_PREFIX="rockchip-rk3568"

config/boards/nanopi-r6s.csc

@@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="nanopi-r6s-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,edge"
-KERNEL_TEST_TARGET="vendor"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"

config/boards/nanopim4v2.csc → config/boards/nanopim4v2.conf

@@ -1,7 +1,7 @@
 # Rockchip RK3399 hexa core 4GB RAM SoC GBE eMMC USB3 USB-C WiFi/BT
 BOARD_NAME="NanoPi M4V2"
 BOARDFAMILY="rockchip64" # Used to be rk3399
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="nanopi-m4v2-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"

config/boards/odroidxu4.conf

@@ -6,4 +6,4 @@ BOOTCONFIG="odroid-xu4_defconfig"
 SERIALCON="ttySAC2"
 KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"

config/boards/orangepi5-plus.conf

@@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="orangepi-5-plus-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,edge"
-KERNEL_TEST_TARGET="vendor"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-plus.dtb"
@@ -36,7 +36,7 @@ function post_family_config_branch_edge__orangepi5plus_use_mainline_uboot() {
 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ mainline U-Boot
 	declare -g BOOTBRANCH="tag:v2024.07"
-	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
+	declare -g BOOTPATCHDIR="v2024.07"
 	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already

config/boards/orangepi5.conf

@@ -5,8 +5,8 @@ BOARD_MAINTAINER="efectn"
 BOOTCONFIG="orangepi-5-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOTCONFIG_SATA="orangepi-5-sata-rk3588s_defconfig"
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,edge"
-KERNEL_TEST_TARGET="vendor"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588s-orangepi-5.dtb"

config/boards/orangepioneplus.csc

@@ -4,5 +4,5 @@ BOARDFAMILY="sun50iw6"
 BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi_one_plus_defconfig"
 KERNEL_TARGET="legacy,current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"
 CRUSTCONFIG="orangepi_3_lts_defconfig"

config/boards/rock-3c.csc

@@ -10,3 +10,5 @@ BOOT_FDT_FILE="rockchip/rk3566-rock-3c.dtb"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_SCENARIO="spl-blobs"
 BOOTFS_TYPE="fat"
+enable_extension "radxa-aic8800"
+AIC8800_TYPE="sdio"

config/boards/rock-5a.conf

@@ -3,7 +3,8 @@ BOARD_NAME="Rock 5A"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="amazingfate"
 BOOTCONFIG="rock-5a-rk3588s_defconfig"
-KERNEL_TARGET="vendor,edge,collabora"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588s-rock-5a.dtb"

config/boards/rock-5b.conf

@@ -3,8 +3,8 @@ BOARD_NAME="Rock 5B"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="amazingfate linhz0hz"
 BOOTCONFIG="rock-5b-rk3588_defconfig"
-KERNEL_TARGET="vendor,edge,collabora"
-KERNEL_TEST_TARGET="vendor"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-rock-5b.dtb"

config/boards/rockpi-4b.csc

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="rock-pi-4-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4b.dtb"