Skip to content

Commit 1c86e5f

Browse files
committed
generator: yml: Update stable anchor to 6.18
This is the latest stable release. Apply 70264df ("generator: yml: Drop support for LLVM 13 and 14 from mainline") f178ac9 ("generator: yml: Disable arm64 big endian builds on -next and mainline") f5956d3 ("generator: yml: Handle CONFIG_CFI_CLANG → CONFIG_CFI") to the stable builds, as the kernel changes that necessitated those modifications are now in this branch. Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent 394d587 commit 1c86e5f

File tree

11 files changed

+37
-143
lines changed

11 files changed

+37
-143
lines changed

generator/yml/0004-trees.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
trees:
22
- &mainline {git_repo: *mainline-url, git_ref: master, name: mainline}
33
- &next {git_repo: *next-url, git_ref: master, name: next}
4-
- &stable {git_repo: *stable-url, git_ref: linux-6.17.y, name: stable}
4+
- &stable {git_repo: *stable-url, git_ref: linux-6.18.y, name: stable}
55
- &stable-6_12 {git_repo: *stable-url, git_ref: linux-6.12.y, name: "6.12"}
66
- &stable-6_6 {git_repo: *stable-url, git_ref: linux-6.6.y, name: "6.6"}
77
- &stable-6_1 {git_repo: *stable-url, git_ref: linux-6.1.y, name: "6.1"}
@@ -50,8 +50,6 @@ tree_schedules:
5050
- &stable_llvm_17 {<< : *llvm_17, << : *stable, << : *thur_three}
5151
- &stable_llvm_16 {<< : *llvm_16, << : *stable, << : *fri_three}
5252
- &stable_llvm_15 {<< : *llvm_15, << : *stable, << : *sat_three}
53-
- &stable_llvm_14 {<< : *llvm_14, << : *stable, << : *sun_three}
54-
- &stable_llvm_13 {<< : *llvm_13, << : *stable, << : *sun_three}
5553

5654
# Longterm stable (LTS) kernels see less frequent updates the older that they get
5755
# Follow a similar scheme above and build new tree/toolchain combinations more

generator/yml/0009-llvm-13.yml

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,6 @@
11
#############
22
# LLVM 13 #
33
#############
4-
###########################
5-
# Latest stable release #
6-
###########################
7-
- {<< : *arm32_v5, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
8-
# BPF uses check_mul_overflow() with a 'long long' value, which is broken prior to clang-14:
9-
# https://github.com/llvm/llvm-project/commit/5c91b98c5d45243352bf10262454bcac77cd3fed
10-
# - {<< : *arm32_v6, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
11-
- {<< : *arm32_v7, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
12-
- {<< : *arm32_v7_t, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
13-
- {<< : *arm32_imx, << : *stable, << : *llvm_full, boot: false, << : *llvm_13}
14-
- {<< : *arm32_omap, << : *stable, << : *llvm_full, boot: false, << : *llvm_13}
15-
- {<< : *arm32_lpae_fp, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
16-
# BPF uses check_mul_overflow() with a 'long long' value, which is broken prior to clang-14:
17-
# https://github.com/llvm/llvm-project/commit/5c91b98c5d45243352bf10262454bcac77cd3fed
18-
# - {<< : *arm32_allmod, << : *stable, << : *llvm_full, boot: false, << : *llvm_13}
19-
- {<< : *arm32_allno, << : *stable, << : *llvm_full, boot: false, << : *llvm_13}
20-
# BPF uses check_mul_overflow() with a 'long long' value, which is broken prior to clang-14:
21-
# https://github.com/llvm/llvm-project/commit/5c91b98c5d45243352bf10262454bcac77cd3fed
22-
# - {<< : *arm32_allyes, << : *stable, << : *llvm_full, boot: false, << : *llvm_13}
23-
# - {<< : *arm32_alpine, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
24-
# - {<< : *arm32_suse, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
25-
- {<< : *arm64, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
26-
- {<< : *arm64_lto_full, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
27-
- {<< : *arm64_lto_thin, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
28-
- {<< : *arm64_kasan, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
29-
- {<< : *arm64_kasan_sw, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
30-
- {<< : *arm64_ubsan, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
31-
- {<< : *arm64_allmod, << : *stable, << : *llvm_full, boot: false, << : *llvm_13}
32-
- {<< : *arm64_allmod_lto, << : *stable, << : *llvm_full, boot: false, << : *llvm_13}
33-
- {<< : *arm64_allno, << : *stable, << : *llvm_full, boot: false, << : *llvm_13}
34-
- {<< : *arm64_allyes, << : *stable, << : *llvm_full, boot: false, << : *llvm_13}
35-
- {<< : *arm64_alpine, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
36-
- {<< : *arm64_fedora, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
37-
- {<< : *arm64_suse, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
38-
- {<< : *hexagon, << : *stable, << : *llvm_full, boot: false, << : *llvm_13}
39-
- {<< : *hexagon_allmod, << : *stable, << : *llvm_full, boot: false, << : *llvm_13}
40-
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
41-
- {<< : *mips, << : *stable, << : *llvm, boot: true, << : *llvm_13}
42-
- {<< : *mipsel, << : *stable, << : *llvm, boot: true, << : *llvm_13}
43-
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
44-
# - {<< : *ppc32, << : *stable, << : *llvm, boot: true, << : *llvm_13}
45-
- {<< : *ppc64_no_werror, << : *stable, << : *llvm, boot: true, << : *llvm_13}
46-
- {<< : *ppc64le, << : *stable, << : *llvm, boot: true, << : *llvm_13}
47-
- {<< : *ppc64le_fedora, << : *stable, << : *clang, boot: true, << : *llvm_13}
48-
- {<< : *ppc64le_suse, << : *stable, << : *clang, boot: true, << : *llvm_13}
49-
- {<< : *riscv, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
50-
- {<< : *riscv_allmod, << : *stable, << : *llvm_full, boot: false, << : *llvm_13}
51-
- {<< : *riscv_alpine, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
52-
- {<< : *riscv_suse, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
53-
- {<< : *um, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
544
############
555
# 6.12.y #
566
############

generator/yml/0009-llvm-14.yml

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,10 @@
11
#############
22
# LLVM 14 #
33
#############
4-
###########################
5-
# Latest stable release #
6-
###########################
7-
# configs: trees: make_variables: BOOT=1 llvm_versions:
8-
- {<< : *arm32_v5, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
9-
- {<< : *arm32_v6, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
10-
- {<< : *arm32_v7, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
11-
- {<< : *arm32_v7_t, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
12-
- {<< : *arm32_imx, << : *stable, << : *llvm_full, boot: false, << : *llvm_14}
13-
- {<< : *arm32_omap, << : *stable, << : *llvm_full, boot: false, << : *llvm_14}
14-
- {<< : *arm32_lpae_fp, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
15-
- {<< : *arm32_allmod, << : *stable, << : *llvm_full, boot: false, << : *llvm_14}
16-
- {<< : *arm32_allno, << : *stable, << : *llvm_full, boot: false, << : *llvm_14}
17-
- {<< : *arm32_allyes, << : *stable, << : *llvm_full, boot: false, << : *llvm_14}
18-
- {<< : *arm32_alpine, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
19-
- {<< : *arm32_suse, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
20-
- {<< : *arm64, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
21-
- {<< : *arm64_lto_full, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
22-
- {<< : *arm64_lto_thin, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
23-
- {<< : *arm64_kasan, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
24-
- {<< : *arm64_kasan_sw, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
25-
- {<< : *arm64_ubsan, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
26-
- {<< : *arm64_allmod, << : *stable, << : *llvm_full, boot: false, << : *llvm_14}
27-
- {<< : *arm64_allmod_lto, << : *stable, << : *llvm_full, boot: false, << : *llvm_14}
28-
- {<< : *arm64_allno, << : *stable, << : *llvm_full, boot: false, << : *llvm_14}
29-
- {<< : *arm64_allyes, << : *stable, << : *llvm_full, boot: false, << : *llvm_14}
30-
- {<< : *arm64_alpine, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
31-
- {<< : *arm64_fedora, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
32-
- {<< : *arm64_suse, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
33-
- {<< : *hexagon, << : *stable, << : *llvm_full, boot: false, << : *llvm_14}
34-
- {<< : *hexagon_allmod, << : *stable, << : *llvm_full, boot: false, << : *llvm_14}
35-
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
36-
- {<< : *mips, << : *stable, << : *llvm, boot: true, << : *llvm_14}
37-
- {<< : *mipsel, << : *stable, << : *llvm, boot: true, << : *llvm_14}
38-
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
39-
# - {<< : *ppc32, << : *stable, << : *llvm, boot: true, << : *llvm_14}
40-
- {<< : *ppc64, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
41-
- {<< : *ppc64le, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
42-
- {<< : *ppc64le_fedora, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
43-
- {<< : *ppc64le_suse, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
44-
- {<< : *riscv, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
45-
- {<< : *riscv_lto_thin, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
46-
- {<< : *riscv_allmod, << : *stable, << : *llvm_full, boot: false, << : *llvm_14}
47-
- {<< : *riscv_allmod_lto, << : *stable, << : *llvm_full, boot: false, << : *llvm_14}
48-
- {<< : *riscv_alpine, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
49-
- {<< : *riscv_suse, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
50-
- {<< : *um, << : *stable, << : *llvm_full, boot: true, << : *llvm_14}
514
############
525
# 6.12.y #
536
############
7+
# configs: trees: make_variables: BOOT=1 llvm_versions:
548
- {<< : *arm32_v5, << : *stable-6_12, << : *llvm_full, boot: true, << : *llvm_14}
559
- {<< : *arm32_v6, << : *stable-6_12, << : *llvm_full, boot: true, << : *llvm_14}
5610
- {<< : *arm32_v7, << : *stable-6_12, << : *llvm_full, boot: true, << : *llvm_14}

generator/yml/0009-llvm-15.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@
155155
- {<< : *arm32_alpine, << : *stable, << : *llvm_full, boot: true, << : *llvm_15}
156156
- {<< : *arm32_suse, << : *stable, << : *llvm_full, boot: true, << : *llvm_15}
157157
- {<< : *arm64, << : *stable, << : *llvm_full, boot: true, << : *llvm_15}
158-
- {<< : *arm64be, << : *stable, << : *llvm_full, boot: true, << : *llvm_15}
159158
- {<< : *arm64_lto_full, << : *stable, << : *llvm_full, boot: true, << : *llvm_15}
160159
- {<< : *arm64_lto_thin, << : *stable, << : *llvm_full, boot: true, << : *llvm_15}
161160
- {<< : *arm64_kasan, << : *stable, << : *llvm_full, boot: true, << : *llvm_15}

generator/yml/0009-llvm-16.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
- {<< : *arm32_v6, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
159159
- {<< : *arm32_v7, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
160160
- {<< : *arm32_v7_t, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
161-
- {<< : *arm32_cfi_cl, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
161+
- {<< : *arm32_cfi, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
162162
- {<< : *arm32_imx, << : *stable, << : *llvm_full, boot: false, << : *llvm_16}
163163
- {<< : *arm32_omap, << : *stable, << : *llvm_full, boot: false, << : *llvm_16}
164164
- {<< : *arm32_lpae_fp, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
@@ -168,11 +168,10 @@
168168
- {<< : *arm32_alpine, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
169169
- {<< : *arm32_suse, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
170170
- {<< : *arm64, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
171-
- {<< : *arm64be, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
172171
- {<< : *arm64_lto_full, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
173172
- {<< : *arm64_lto_thin, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
174-
- {<< : *arm64_cfi_cl, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
175-
- {<< : *arm64_cfi_cl_lto, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
173+
- {<< : *arm64_cfi, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
174+
- {<< : *arm64_cfi_lto, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
176175
- {<< : *arm64_kasan, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
177176
- {<< : *arm64_kasan_sw, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
178177
- {<< : *arm64_ubsan, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
@@ -212,8 +211,8 @@
212211
- {<< : *x86_64, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
213212
- {<< : *x86_64_lto_full, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
214213
- {<< : *x86_64_lto_thin, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
215-
- {<< : *x86_64_cfi_cl, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
216-
- {<< : *x86_64_cfi_cl_lto, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
214+
- {<< : *x86_64_cfi, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
215+
- {<< : *x86_64_cfi_lto, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
217216
- {<< : *x86_64_kasan, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
218217
- {<< : *x86_64_kcsan, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}
219218
- {<< : *x86_64_ubsan, << : *stable, << : *llvm_full, boot: true, << : *llvm_16}

generator/yml/0009-llvm-17.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
- {<< : *arm32_v6, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
165165
- {<< : *arm32_v7, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
166166
- {<< : *arm32_v7_t, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
167-
- {<< : *arm32_cfi_cl, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
167+
- {<< : *arm32_cfi, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
168168
- {<< : *arm32_imx, << : *stable, << : *llvm_full, boot: false, << : *llvm_17}
169169
- {<< : *arm32_omap, << : *stable, << : *llvm_full, boot: false, << : *llvm_17}
170170
- {<< : *arm32_lpae_fp, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
@@ -174,11 +174,10 @@
174174
- {<< : *arm32_alpine, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
175175
- {<< : *arm32_suse, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
176176
- {<< : *arm64, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
177-
- {<< : *arm64be, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
178177
- {<< : *arm64_lto_full, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
179178
- {<< : *arm64_lto_thin, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
180-
- {<< : *arm64_cfi_cl, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
181-
- {<< : *arm64_cfi_cl_lto, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
179+
- {<< : *arm64_cfi, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
180+
- {<< : *arm64_cfi_lto, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
182181
- {<< : *arm64_kasan, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
183182
- {<< : *arm64_kasan_sw, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
184183
- {<< : *arm64_ubsan, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
@@ -220,8 +219,8 @@
220219
- {<< : *x86_64, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
221220
- {<< : *x86_64_lto_full, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
222221
- {<< : *x86_64_lto_thin, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
223-
- {<< : *x86_64_cfi_cl, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
224-
- {<< : *x86_64_cfi_cl_lto, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
222+
- {<< : *x86_64_cfi, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
223+
- {<< : *x86_64_cfi_lto, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
225224
- {<< : *x86_64_kasan, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
226225
- {<< : *x86_64_kcsan, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}
227226
- {<< : *x86_64_ubsan, << : *stable, << : *llvm_full, boot: true, << : *llvm_17}

0 commit comments

Comments
 (0)