Merge branch 'armbian:main' into main

config/boards/README.md

@@ -75,6 +75,7 @@ If you are unsure about the documentation then invoke `$ grep -r -A5 -B5 "BUILD_
 		- [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. 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

config/boards/khadas-edge2.conf

@@ -6,6 +6,7 @@ declare -g BOOT_SOC="rk3588" # Just to avoid errors in rockchip64_commmon
 declare -g KERNEL_TARGET="edge,current,vendor"
 declare -g KERNEL_TEST_TARGET="vendor,current"
 declare -g IMAGE_PARTITION_TABLE="gpt"
+declare -g KERNEL_UPGRADE_FREEZE="[email protected]"
 declare -g BOOT_FDT_FILE="rockchip/rk3588s-khadas-edge2.dtb" # Specific to this board
 
 declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS9 bcm43xx 1500000" # For the bluetooth-hciattach extension

config/boards/orangepi5-plus.conf

@@ -13,6 +13,7 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
+KERNEL_UPGRADE_FREEZE="[email protected]"
 declare -g UEFI_EDK2_BOARD_ID="orangepi-5plus" # This _only_ used for uefi-edk2-rk3588 extension
 
 function post_family_tweaks__orangepi5plus_naming_audios() {

config/boards/orangepi5.conf

@@ -14,7 +14,7 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
-KERNEL_UPGRADE_FREEZE="24.8.1"
+KERNEL_UPGRADE_FREEZE="vendor-rk35xx@24.8.1"
 declare -g UEFI_EDK2_BOARD_ID="orangepi-5" # This _only_ used for uefi-edk2-rk3588 extension
 
 # @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up

config/boards/orangepi5pro.wip

@@ -13,6 +13,7 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
+KERNEL_UPGRADE_FREEZE="[email protected]"
 
 function post_family_tweaks__orangepi5pro_naming_audios() {
 	display_alert "$BOARD" "Renaming orangepi5pro audios" "info"

config/kernel/linux-rockchip-rk3588-6.10.config

@@ -7970,7 +7970,7 @@ CONFIG_SCSI_UFSHCD_PLATFORM=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_FLASH=m
-# CONFIG_LEDS_CLASS_MULTICOLOR is not set
+CONFIG_LEDS_CLASS_MULTICOLOR=y
 # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
 
 #

config/kernel/linux-rockchip-rk3588-6.11.config

@@ -8033,7 +8033,7 @@ CONFIG_SCSI_UFSHCD_PLATFORM=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_FLASH=m
-# CONFIG_LEDS_CLASS_MULTICOLOR is not set
+CONFIG_LEDS_CLASS_MULTICOLOR=y
 # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
 
 #

lib/functions/bsp/armbian-bsp-cli-deb.sh

@@ -210,12 +210,17 @@ function compile_armbian-bsp-cli() {
 
 	### preventing upgrading stable kernels beyond version if defined
 	# if freeze variable is removed, upgrade becomes possible again
-	if [[ "${BETA}" != "yes" && -n "${KERNEL_UPGRADE_FREEZE}" ]]; then
-		cat <<- EOF >> "${destination}"/etc/apt/preferences.d/frozen-armbian
-		Package: linux-*-${BRANCH}-${LINUXFAMILY}
-		Pin: version ${KERNEL_UPGRADE_FREEZE}
-		Pin-Priority: 999
-		EOF
+	if [[ "${BETA}" != "yes" ]]; then
+		for pin_variants in $(echo $KERNEL_UPGRADE_FREEZE | sed "s/,/ /g"); do
+		extracted_pins=(${pin_variants//@/ })
+			if [[ "${BRANCH}-${LINUXFAMILY}" == "${extracted_pins[0]}" ]]; then
+				cat <<- EOF >> "${destination}"/etc/apt/preferences.d/frozen-armbian
+				Package: linux-*-${extracted_pins[0]}
+				Pin: version ${extracted_pins[1]}
+				Pin-Priority: 999
+				EOF
+			fi
+		done
 	else
 		touch "${destination}"/etc/apt/preferences.d/frozen-armbian
 	fi