Skip to content

Commit

Permalink
Merge tag 'v24.8.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
xaqbr committed Sep 19, 2024
2 parents 421efbc + 7d745b9 commit 2b5d14f
Show file tree
Hide file tree
Showing 876 changed files with 5,577 additions and 453,858 deletions.
3 changes: 3 additions & 0 deletions .github/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,6 @@
- name: "Improper usage"
color: "CD456C"
description: "Provided input is not in the expected data format or structure"
- name: "Giveaway"
color: "DA4C13"
description: "Code completition was selected to enter contributors giveaway"
18 changes: 8 additions & 10 deletions .github/workflows/forked-helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@v2.3.3
uses: ossf/scorecard-action@v2.4.0
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -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@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
with:
name: SARIF file
path: results.sarif
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.8.0-trunk
24.8.2
3 changes: 2 additions & 1 deletion config/boards/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ If you are unsure about the documentation then invoke `$ grep -r -A5 -B5 "BUILD_
- edge: Use edge kernel
- [branch]: Use specified [branch] kernel
- [none]: Exits with error
- **KERNEL_TEST_TARGET** ( comma-separated list of kernel releases or branches ): if test targets are different for testings (internal switch)
- **KERNEL_TEST_TARGET** ( comma-separated list of kernel releases or branches ): if test targets are different for testings. Also applies to build list generation. (internal switch)
- **KERNEL_UPGRADE_FREEZE** ( comma-separated list of kernels with versions obove which they stop updating, example: KERNEL_UPGRADE_FREEZE="[email protected],[email protected]" )
- **FULL_DESKTOP** ( boolean ): defines whether to install desktop stack of applications such as office, thunderbird, etc..
- Values:
- yes: install desktop stack
Expand Down
1 change: 1 addition & 0 deletions config/boards/aml-a311d-cc.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ BOARD_NAME="Libre Computer Alta"
BOARDFAMILY="meson-g12b"
BOARD_MAINTAINER="Tonymac32"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="edge"
MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
FULL_DESKTOP="yes"
SERIALCON="ttyAML0"
Expand Down
1 change: 1 addition & 0 deletions config/boards/aml-s9xx-box.tvb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ BOARD_MAINTAINER="SteeManMI"
BOOTSIZE="512"
BOOTFS_TYPE="fat"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
SERIALCON="ttyAML0"
FULL_DESKTOP="yes"
ASOUND_STATE="asound.state.mesongx"
Expand Down
1 change: 1 addition & 0 deletions config/boards/aml-t95z-plus.tvb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ BOARDFAMILY="meson-gxl" # s912's are actually meson-gxm,
BOOTCONFIG="meson-gxm-t95z-plus_defconfig" # patched-in
BOARD_MAINTAINER=""
KERNEL_TARGET="edge"
KERNEL_TEST_TARGET="edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"

Expand Down
3 changes: 2 additions & 1 deletion config/boards/armsom-sige5.csc
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
BOARD_NAME="ArmSoM Sige5"
BOARDFAMILY="rk35xx"
BOOTCONFIG="armsom-sige5-rk3576_defconfig"
KERNEL_TARGET="rk3576"
KERNEL_TARGET="vendor"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3576-armsom-sige5.dtb"
BOOT_SCENARIO="spl-blobs"
IMAGE_PARTITION_TABLE="gpt"
SRC_EXTLINUX="yes"
MODULES_BLACKLIST="panfrost"
BOARD_MAINTAINER=""

function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {
display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
Expand Down
2 changes: 1 addition & 1 deletion config/boards/armsom-sige7.csc
Original file line number Diff line number Diff line change
Expand Up @@ -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="edge,current,vendor"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3588-armsom-sige7.dtb"
Expand Down
155 changes: 0 additions & 155 deletions config/boards/ayn-odin2.conf

This file was deleted.

14 changes: 0 additions & 14 deletions config/boards/bananapi.csc

This file was deleted.

2 changes: 1 addition & 1 deletion config/boards/bananapicm4io.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ BOARDFAMILY="meson-g12b"
BOARD_MAINTAINER="pyavitz"
BOOTCONFIG="bananapi-cm4-cm4io_defconfig"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
FULL_DESKTOP="yes"
SERIALCON="ttyAML0"
Expand Down
1 change: 1 addition & 0 deletions config/boards/bananapim1plus.csc
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ BOARDFAMILY="sun7i"
BOARD_MAINTAINER=""
BOOTCONFIG="bananapi_m1_plus_defconfig"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TEST_TARGET="current"
1 change: 1 addition & 0 deletions config/boards/bananapim2.eos
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ BOARD_MAINTAINER=""
BOOTCONFIG="Sinovoip_BPI_M2_defconfig"
OVERLAY_PREFIX="sun6i-a31s"
KERNEL_TARGET="legacy,current"
KERNEL_TEST_TARGET="current"
1 change: 1 addition & 0 deletions config/boards/bananapim2plus.csc
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ MODULES_CURRENT="g_serial"
MODULES_LEGACY="g_serial"
SERIALCON="ttyS0,ttyGS0"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TEST_TARGET="current"
1 change: 1 addition & 0 deletions config/boards/bananapim2pro.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ BOARD_MAINTAINER="bretmlw"
BOOTCONFIG="bananapi-m2-pro_defconfig"
BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m2-pro.dtb"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
FULL_DESKTOP="yes"
SERIALCON="ttyAML0"
Expand Down
1 change: 1 addition & 0 deletions config/boards/bananapim2s.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ BOARDFAMILY="meson-g12b"
BOARD_MAINTAINER="pyavitz jeanrhum"
BOOTCONFIG="bananapi-m2s_defconfig"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
FULL_DESKTOP="yes"
SERIALCON="ttyAML0"
Expand Down
1 change: 1 addition & 0 deletions config/boards/bananapim2zero.csc
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ MODULES_LEGACY="g_serial"
MODULES_CURRENT="g_serial"
SERIALCON="ttyS0,ttyGS0"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TEST_TARGET="current"
1 change: 1 addition & 0 deletions config/boards/bananapim3.csc
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ BOARD_MAINTAINER="AaronNGray"
BOOTCONFIG="Sinovoip_BPI_M3_defconfig"
OVERLAY_PREFIX="sun8i-a83t"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TEST_TARGET="current"
1 change: 1 addition & 0 deletions config/boards/bananapim4zero.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ BOOTCONFIG="bananapi_m4zero_defconfig"
OVERLAY_PREFIX="sun50i-h616"
BOOT_LOGO="desktop"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
MODULES_BLACKLIST="rtw88_8821c rtw88_8821cu"
FORCE_BOOTSCRIPT_UPDATE="yes"
BOOTBRANCH_BOARD="tag:v2024.01"
Expand Down
1 change: 1 addition & 0 deletions config/boards/bananapim5.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ BOARD_MAINTAINER="bretmlw"
BOOTCONFIG="bananapi-m5_defconfig"
BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m5.dtb"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
FULL_DESKTOP="yes"
SERIALCON="ttyAML0"
Expand Down
1 change: 1 addition & 0 deletions config/boards/bananapim64.csc
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ BOARD_MAINTAINER="devdotnetorg"
BOOTCONFIG_DEFAULT="sun50iw1p1_config"
BOOTCONFIG="bananapi_m64_defconfig"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TEST_TARGET="current"
CRUSTCONFIG="a64_defconfig"
6 changes: 3 additions & 3 deletions config/boards/bananapim7.conf
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source "${SRC}/config/boards/armsom-sige7.csc"
BOARD_NAME="Banana Pi M7"
BOARD_MAINTAINER="amazingfate"
BOARD_MAINTAINER="amazingfate,Z-Keven"
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="edge,current,vendor"
KERNEL_TEST_TARGET="vendor,current"
BOARDFAMILY="rockchip-rk3588"
2 changes: 1 addition & 1 deletion config/boards/bananapipro.csc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ BOARDFAMILY="sun7i"
BOARD_MAINTAINER=""
BOOTCONFIG="Bananapro_defconfig"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TEST_TARGET="current,edge"
KERNEL_TEST_TARGET="current"

function post_config_uboot_target__extra_configs_for_bananapipro() {
display_alert "$BOARD" "set dram clock" "info"
Expand Down
1 change: 1 addition & 0 deletions config/boards/bananapir2.csc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ BOARD_NAME="Banana Pi R2"
BOARDFAMILY="mt7623"
BOARD_MAINTAINER=""
KERNEL_TARGET="current"
KERNEL_TEST_TARGET="current"
BOOTCONFIG="mt7623n_bpir2_defconfig"
BOOT_FDT_FILE="mediatek/mt7623n-bananapi-bpi-r2"
HAS_VIDEO_OUTPUT="yes"
Loading

0 comments on commit 2b5d14f

Please sign in to comment.