Skip to content

Commit 57f2068

Browse files
EvilOlafigorpecovnik
authored andcommitted
bump 7.0 to rc5
leave repository workaround in place for now
1 parent 9082836 commit 57f2068

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

config/sources/mainline-kernel.conf.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
function mainline_kernel_decide_version__upstream_release_candidate_number() {
99
[[ -n "${KERNELBRANCH}" ]] && return 0 # if already set, don't touch it; that way other hooks can run in any order
1010
if [[ "${KERNEL_MAJOR_MINOR}" == "7.0" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
11-
declare -g KERNELBRANCH="tag:v7.0-rc4"
11+
declare -g KERNELBRANCH="tag:v7.0-rc5"
1212
display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
1313
fi
1414
}
@@ -24,15 +24,15 @@ function mainline_kernel_decide_version__upstream_release_candidate_number() {
2424

2525
### Later-than-usual hooks, for changing parameters after the hooks above have run. use mainline_kernel_decide_version__750 or higher.
2626

27-
# # Example: 6.7-rc7 was released by Linus, but kernel.org git and google git mirrors took a while to catch up; change the source to pull directly from Linus.
28-
# # This was necessary for a few days in late December 2023, but no longer; tag was pushed on 28/Dec/2023.
29-
# function mainline_kernel_decide_version__750_use_torvalds_for_6.7-rc7() {
30-
# if [[ "${KERNELBRANCH}" == 'tag:v7.0-rc4' ]]; then
31-
# display_alert "Using Linus kernel repo for 6.7-rc7" "${KERNELBRANCH}" "warn"
32-
# declare -g KERNELSOURCE="https://github.com/torvalds/linux.git"
33-
# display_alert "mainline-kernel: missing torvalds tag on 6.7-rc7" "Using KERNELSOURCE='${KERNELSOURCE}' for KERNELBRANCH='${KERNELBRANCH}'" "info"
34-
# fi
35-
# }
27+
# Example: 6.7-rc7 was released by Linus, but kernel.org git and google git mirrors took a while to catch up; change the source to pull directly from Linus.
28+
# This was necessary for a few days in late December 2023, but no longer; tag was pushed on 28/Dec/2023.
29+
function mainline_kernel_decide_version__750_use_torvalds_for_7.0-rc5() {
30+
if [[ "${KERNELBRANCH}" == 'tag:v7.0-rc5' ]]; then
31+
display_alert "Using Linus kernel repo for 7.0-rc5" "${KERNELBRANCH}" "warn"
32+
declare -g KERNELSOURCE="https://github.com/torvalds/linux.git"
33+
display_alert "mainline-kernel: missing torvalds tag on 7.0-rc5" "Using KERNELSOURCE='${KERNELSOURCE}' for KERNELBRANCH='${KERNELBRANCH}'" "info"
34+
fi
35+
}
3636

3737
### Last hooks, defaults to branch if not set by previous hooks. Use mainline_kernel_decide_version__900 or higher.
3838
function mainline_kernel_decide_version__900_defaults() {

0 commit comments

Comments
 (0)