Qubot/armbian-b
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved freezing mechanism with README

Browse Source
This commit is contained in:
Igor Pecovnik 2024-08-24 18:45:44 +02:00 committed by August
parent 87165aed5c
commit 28f520420d
6 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/boards/README.md
View File

@ -75,6 +75,7 @@ If you are unsure about the documentation then invoke `$ grep -r -A5 -B5 "BUILD_
- [branch]: Use specified [branch] kernel - [branch]: Use specified [branch] kernel
- [none]: Exits with error - [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_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="vendor-rk35xx@24.8.1,current-rockchip-rk3588@24.8.2" )
- **FULL_DESKTOP** ( boolean ): defines whether to install desktop stack of applications such as office, thunderbird, etc.. - **FULL_DESKTOP** ( boolean ): defines whether to install desktop stack of applications such as office, thunderbird, etc..
- Values: - Values:
- yes: install desktop stack - yes: install desktop stack

1
config/boards/khadas-edge2.conf
View File

@ -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_TARGET="edge,current,vendor"
declare -g KERNEL_TEST_TARGET="vendor,current" declare -g KERNEL_TEST_TARGET="vendor,current"
declare -g IMAGE_PARTITION_TABLE="gpt" declare -g IMAGE_PARTITION_TABLE="gpt"
declare -g KERNEL_UPGRADE_FREEZE="vendor-rk35xx@24.8.1"
declare -g BOOT_FDT_FILE="rockchip/rk3588s-khadas-edge2.dtb" # Specific to this board 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 declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS9 bcm43xx 1500000" # For the bluetooth-hciattach extension

1
config/boards/orangepi5-plus.conf
View File

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

2
config/boards/orangepi5.conf
View File

@ -14,7 +14,7 @@ BOOT_SCENARIO="spl-blobs"
BOOT_SUPPORT_SPI="yes" BOOT_SUPPORT_SPI="yes"
BOOT_SPI_RKSPI_LOADER="yes" BOOT_SPI_RKSPI_LOADER="yes"
IMAGE_PARTITION_TABLE="gpt" 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 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 # @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up

1
config/boards/orangepi5pro.wip
View File

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

11
lib/functions/bsp/armbian-bsp-cli-deb.sh
View File

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