Skip to content

Commit 603289c

Browse files
nathanchancenathanchance
committed
generator: yml: Refactor allmodconfig + LTO configs into their own anchors
These lists are getting long and we risk needing to adjust the spacing throughout the rest of the file if they grow any more. Refactor these lists into their own anchors similar to the kasan_configs ones so that they can be freely adjusted. Signed-off-by: Nathan Chancellor <[email protected]>
1 parent d7551b3 commit 603289c

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

‎generator/yml/0007-configs.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
kasan_configs:
22
- &arm64-kasan-configs {config: [defconfig, CONFIG_FTRACE=y, CONFIG_KASAN=y, CONFIG_KASAN_KUNIT_TEST=y, CONFIG_KASAN_VMALLOC=y, CONFIG_KUNIT=y]}
33
- &arm64-kasan-sw-configs {config: [defconfig, CONFIG_FTRACE=y, CONFIG_KASAN=y, CONFIG_KASAN_KUNIT_TEST=y, CONFIG_KASAN_SW_TAGS=y, CONFIG_KUNIT=y]}
4+
allmod_lto_configs:
5+
# CONFIG_FORTIFY_KUNIT_TEST disabled due to https://github.com/ClangBuiltLinux/linux/issues/2075
6+
- &arm64-allmod-lto-configs {config: [allmodconfig, CONFIG_GCOV_KERNEL=n, CONFIG_KASAN=n, CONFIG_LTO_CLANG_THIN=y, CONFIG_FORTIFY_KUNIT_TEST=n]}
7+
# CONFIG_DRM_OMAP=n due to https://github.com/ClangBuiltLinux/linux/issues/2038
8+
- &loong-allmod-lto-configs {config: [allmodconfig, CONFIG_FTRACE=n, CONFIG_GCOV_KERNEL=n, CONFIG_LTO_CLANG_THIN=y, CONFIG_DRM_OMAP=n]}
9+
- &riscv-allmod-lto-configs {config: [allmodconfig, CONFIG_WERROR=n, CONFIG_GCOV_KERNEL=n, CONFIG_LTO_CLANG_THIN=y]}
10+
- &x86_64-allmod-lto-configs {config: [allmodconfig, CONFIG_GCOV_KERNEL=n, CONFIG_KASAN=n, CONFIG_LTO_CLANG_THIN=y, CONFIG_FORTIFY_KUNIT_TEST=n]}
411
configs:
512
# config: image target (optional) [ARCH:] (Optional: x86) targets to build
613
- &arm32_v5 {config: multi_v5_defconfig, ARCH: *arm-arch, << : *kernel_dtbs}
@@ -31,8 +38,7 @@ configs:
3138
- &arm64_gki {config: [gki_defconfig, CONFIG_DEBUG_INFO_COMPRESSED_ZSTD=n], ARCH: *arm64-arch, << : *kernel}
3239
- &arm64_cut {config: cuttlefish_defconfig, ARCH: *arm64-arch, << : *kernel}
3340
- &arm64_allmod {config: allmodconfig, ARCH: *arm64-arch, << : *default}
34-
# CONFIG_FORTIFY_KUNIT_TEST disabled due to https://github.com/ClangBuiltLinux/linux/issues/2075
35-
- &arm64_allmod_lto {config: [allmodconfig, CONFIG_GCOV_KERNEL=n, CONFIG_KASAN=n, CONFIG_LTO_CLANG_THIN=y, CONFIG_FORTIFY_KUNIT_TEST=n], ARCH: *arm64-arch, << : *default}
41+
- &arm64_allmod_lto {<< : *arm64-allmod-lto-configs, ARCH: *arm64-arch, << : *default}
3642
- &arm64_allno {config: allnoconfig, ARCH: *arm64-arch, << : *default}
3743
- &arm64_allyes {config: allyesconfig, ARCH: *arm64-arch, << : *default}
3844
- &arm64_alpine {config: *arm64-alpine-config-url, ARCH: *arm64-arch, << : *kernel}
@@ -53,7 +59,7 @@ configs:
5359
- &loong_lto_thin {config: [defconfig, CONFIG_LTO_CLANG_THIN=y], ARCH: *loongarch-arch, << : *kernel}
5460
# CONFIG_DRM_OMAP=n due to https://github.com/ClangBuiltLinux/linux/issues/2038
5561
- &loong_allmod {config: [allmodconfig, CONFIG_DRM_OMAP=n], ARCH: *loongarch-arch, << : *default}
56-
- &loong_allmod_lto {config: [allmodconfig, CONFIG_FTRACE=n, CONFIG_GCOV_KERNEL=n, CONFIG_LTO_CLANG_THIN=y, CONFIG_DRM_OMAP=n], ARCH: *loongarch-arch, << : *default}
62+
- &loong_allmod_lto {<< : *loong-allmod-lto-configs, ARCH: *loongarch-arch, << : *default}
5763
- &mips {config: [malta_defconfig, CONFIG_BLK_DEV_INITRD=y, CONFIG_CPU_BIG_ENDIAN=y], kernel_image: vmlinux, ARCH: *mips-arch, << : *kernel}
5864
- &mipsel {config: [malta_defconfig, CONFIG_BLK_DEV_INITRD=y], kernel_image: vmlinux, ARCH: *mips-arch, << : *kernel}
5965
- &ppc32 {config: ppc44x_defconfig, kernel_image: uImage, ARCH: *powerpc-arch, << : *kernel}
@@ -71,7 +77,7 @@ configs:
7177
- &riscv_lto_full {config: [defconfig, CONFIG_LTO_CLANG_FULL=y], kernel_image: Image, ARCH: *riscv-arch, << : *kernel}
7278
- &riscv_lto_thin {config: [defconfig, CONFIG_LTO_CLANG_THIN=y], kernel_image: Image, ARCH: *riscv-arch, << : *kernel}
7379
- &riscv_allmod {config: [allmodconfig, CONFIG_WERROR=n], kernel_image: Image, ARCH: *riscv-arch, << : *default}
74-
- &riscv_allmod_lto {config: [allmodconfig, CONFIG_WERROR=n, CONFIG_GCOV_KERNEL=n, CONFIG_LTO_CLANG_THIN=y], kernel_image: Image, ARCH: *riscv-arch, << : *default}
80+
- &riscv_allmod_lto {<< : *riscv-allmod-lto-configs, kernel_image: Image, ARCH: *riscv-arch, << : *default}
7581
# https://github.com/ClangBuiltLinux/linux/issues/1143
7682
- &riscv_no_efi {config: [defconfig, CONFIG_EFI=n], kernel_image: Image, ARCH: *riscv-arch, << : *kernel}
7783
- &riscv_alpine {config: *riscv-alpine-config-url, kernel_image: Image, ARCH: *riscv-arch, << : *kernel}
@@ -94,8 +100,7 @@ configs:
94100
- &x86_64_gki {config: [gki_defconfig, CONFIG_DEBUG_INFO_COMPRESSED_ZSTD=n], << : *kernel}
95101
- &x86_64_cut {config: x86_64_cuttlefish_defconfig, << : *kernel}
96102
- &x86_64_allmod {config: allmodconfig, << : *default}
97-
# CONFIG_FORTIFY_KUNIT_TEST disabled due to https://github.com/ClangBuiltLinux/linux/issues/2075
98-
- &x86_64_allmod_lto {config: [allmodconfig, CONFIG_GCOV_KERNEL=n, CONFIG_KASAN=n, CONFIG_LTO_CLANG_THIN=y, CONFIG_FORTIFY_KUNIT_TEST=n], << : *default}
103+
- &x86_64_allmod_lto {<< : *x86_64-allmod-lto-configs, << : *default}
99104
- &x86_64_allno {config: allnoconfig, << : *default}
100105
- &x86_64_allyes {config: allyesconfig, << : *default}
101106
- &x86_64_gcov {config: [defconfig, CONFIG_GCOV_KERNEL=y, CONFIG_GCOV_PROFILE_ALL=y], << : *kernel}

0 commit comments

Comments
 (0)