Skip to content

Commit 3e2f19e

Browse files
committed
generator: yml: Reset CONFIG_EFI_SBAT_FILE for Fedora configurations
Fedora recently added a value for CONFIG_EFI_SBAT_FILE, which breaks the build because that file is not a part of the upstream source tree. Reset this value with =n so that the build continues to work properly. This is only relevant for aarch64 and x86_64, who are the only consumers of this right now. Link: https://src.fedoraproject.org/rpms/kernel/c/5c8ed2f569619f87c8be4f2fc7db7834615ce7f1 Signed-off-by: Nathan Chancellor <[email protected]>
1 parent 72ca2d2 commit 3e2f19e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

generator/yml/0007-configs.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ configs:
4242
- &arm64_allno {config: allnoconfig, ARCH: *arm64-arch, << : *default}
4343
- &arm64_allyes {config: allyesconfig, ARCH: *arm64-arch, << : *default}
4444
- &arm64_alpine {config: *arm64-alpine-config-url, ARCH: *arm64-arch, << : *kernel}
45-
- &arm64_fedora {config: *arm64-fedora-config-url, ARCH: *arm64-arch, << : *kernel}
45+
# CONFIG_EFI_SBAT_FILE=n to unset Fedora's file, which will not exist in our trees
46+
- &arm64_fedora {config: [*arm64-fedora-config-url, CONFIG_EFI_SBAT_FILE=n], ARCH: *arm64-arch, << : *kernel}
4647
# CONFIG_FORTIFY_KUNIT_TEST disabled due to https://github.com/ClangBuiltLinux/linux/issues/2075
47-
- &arm64_fedora_lto {config: [*arm64-fedora-config-url, CONFIG_LTO_CLANG_THIN=y, CONFIG_FORTIFY_KUNIT_TEST=n], ARCH: *arm64-arch, << : *kernel}
48+
- &arm64_fedora_lto {config: [*arm64-fedora-config-url, CONFIG_EFI_SBAT_FILE=n, CONFIG_LTO_CLANG_THIN=y, CONFIG_FORTIFY_KUNIT_TEST=n], ARCH: *arm64-arch, << : *kernel}
4849
# CONFIG_BPF_PRELOAD disabled for pre-5.18 cross compiled Fedora configs: https://github.com/ClangBuiltLinux/linux/issues/1433
4950
- &arm64_fedora_bpf {config: [*arm64-fedora-config-url, CONFIG_BPF_PRELOAD=n], ARCH: *arm64-arch, << : *kernel}
5051
# CONFIG_DEBUG_INFO_BTF disabled for certain SUSE configs due to pahole issue: https://lore.kernel.org/r/[email protected]/
@@ -110,7 +111,8 @@ configs:
110111
- &x86_64_hardening {config: [defconfig, hardening.config], << : *kernel}
111112
- &x86_64_alpine {config: *x86_64-alpine-config-url, << : *kernel}
112113
- &x86_64_arch {config: *x86_64-arch-config-url, << : *kernel}
113-
- &x86_64_fedora {config: *x86_64-fedora-config-url, << : *kernel}
114+
# CONFIG_EFI_SBAT_FILE=n to unset Fedora's file, which will not exist in our trees
115+
- &x86_64_fedora {config: [*x86_64-fedora-config-url, CONFIG_EFI_SBAT_FILE=n], << : *kernel}
114116
# CONFIG_FORTIFY_KUNIT_TEST disabled due to https://github.com/ClangBuiltLinux/linux/issues/2075
115-
- &x86_64_fedora_lto {config: [*x86_64-fedora-config-url, CONFIG_LTO_CLANG_THIN=y, CONFIG_FORTIFY_KUNIT_TEST=n], << : *kernel}
117+
- &x86_64_fedora_lto {config: [*x86_64-fedora-config-url, CONFIG_EFI_SBAT_FILE=n, CONFIG_LTO_CLANG_THIN=y, CONFIG_FORTIFY_KUNIT_TEST=n], << : *kernel}
116118
- &x86_64_suse {config: *x86_64-suse-config-url, << : *kernel}

0 commit comments

Comments
 (0)