enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sunxi/sunxi64: move version locking to shared hook in mainline-kernel.conf.sh

Browse Source
This commit is contained in:
Ricardo Pardini 2023-12-27 21:41:50 +01:00 committed by Igor
parent 8b60fb750d
commit 6a1b52cad1
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/sources/families/include/sunxi64_common.inc
View File

@ -1,4 +1,4 @@
#
ž#
# SPDX-License-Identifier: GPL-2.0
#
# Copyright (c) 2013-2023 Igor Pecovnik, igor@armbian.com
@ -24,17 +24,14 @@ case $BRANCH in
legacy)
declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.1.69"
;;
current)
declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.6.8"
;;
edge)
declare -g KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.7-rc7"
;;
esac

3
config/sources/families/include/sunxi_common.inc
View File

@ -25,17 +25,14 @@ case $BRANCH in
legacy)
declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.1.69"
;;
current)
declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.6.8"
;;
edge)
declare -g KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.7-rc7"
;;
esac

11
config/sources/mainline-kernel.conf.sh
View File

@ -13,6 +13,17 @@ function mainline_kernel_decide_version__upstream_release_candidate_number() {
fi
}
# Maintained by @viraniac
function mainline_kernel_decide_version__sunxi_fixed_versions() {
[[ "${LINUXFAMILY}" != "sunxi" && "${LINUXFAMILY}" != "sunxi64" ]] && return 0 # only for sunxi/sunxi64
case "${KERNEL_MAJOR_MINOR}" in
"6.1") declare -g KERNELBRANCH="tag:v6.1.69" ;;
"6.6") declare -g KERNELBRANCH="tag:v6.6.8" ;;
"6.7") declare -g KERNELBRANCH="tag:v6.7-rc6" ;;
esac
display_alert "mainline-kernel" "Using fixed version for sunxi/sunxi64 KERNELBRANCH='${KERNELBRANCH}'" "info"
}
### Later than normal hooks, for emergencies / locking versions for release / etc. Use mainline_kernel_decide_version__600 or higher.
## Example: "6.6.7 was recently released with changes that break our drivers/patches/souls. Let's Lock 6.6 to 6.6.6 until we've time to fix it."

1
patch/kernel/sunxi-current
View File

@ -1 +0,0 @@
archive/sunxi-6.6

1
patch/kernel/sunxi-edge
View File

@ -1 +0,0 @@
archive/sunxi-6.7

1
patch/kernel/sunxi-legacy
View File

@ -1 +0,0 @@
archive/sunxi-6.1