diff options
-rw-r--r-- | kernel-x86_64-fedora.config | 2 | ||||
-rwxr-xr-x | kernel.spec | 24 |
2 files changed, 16 insertions, 10 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index fbd50a7d6..5f9019b1b 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1235,7 +1235,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_HIGHMEM is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set -CONFIG_DEBUG_INFO_BTF=y +# CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_DWARF4=y # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel.spec b/kernel.spec index 371d0567e..729818a38 100755 --- a/kernel.spec +++ b/kernel.spec @@ -78,7 +78,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 %global distro_build 0.rc5.20210811git761c6d7ec820.44 @@ -112,6 +112,8 @@ Summary: The Linux kernel %endif # define buildid .local +%define packager Thorsten 'knurd' Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories +%define buildid .vanilla.1 %if 0%{?fedora} @@ -147,7 +149,7 @@ Summary: The Linux kernel # kernel PAE (only valid for ARM (lpae)) %define with_pae %{?_without_pae: 0} %{?!_without_pae: 1} # kernel-debug -%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1} +%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0} # kernel-zfcpdump (s390 specific kernel for zfcpdump) %define with_zfcpdump %{?_without_zfcpdump: 0} %{?!_without_zfcpdump: 1} # kernel-doc @@ -160,13 +162,13 @@ Summary: The Linux kernel # tools %define with_tools %{?_without_tools: 0} %{?!_without_tools: 1} # bpf tool -%define with_bpftool %{?_without_bpftool: 0} %{?!_without_bpftool: 1} +%define with_bpftool %{?_with_bpftool: 1} %{?!_with_bpftool: 0} # kernel-debuginfo -%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} +%define with_debuginfo %{?_with_debuginfo: 1} %{?!_with_debuginfo: 0} # kernel-abi-stablelists %define with_kernel_abi_stablelists %{?_without_kernel_abi_stablelists: 0} %{?!_without_kernel_abi_stablelists: 1} # internal samples and selftests -%define with_selftests %{?_without_selftests: 0} %{?!_without_selftests: 1} +%define with_selftests %{?_with_selftests: 1} %{?!_with_selftests: 0} # # Additional options for user-friendly one-off kernel building: # @@ -198,7 +200,7 @@ Summary: The Linux kernel %define with_cross %{?_with_cross: 1} %{?!_with_cross: 0} # # build a release kernel on rawhide -%define with_release %{?_with_release: 1} %{?!_with_release: 0} +%define with_release %{?_without_release: 0} %{?!_without_release: 1} # verbose build, i.e. no silent rules and V=1 %define with_verbose %{?_with_verbose: 1} %{?!_with_verbose: 0} @@ -216,7 +218,7 @@ Summary: The Linux kernel %define with_ipaclones %{?_without_ipaclones: 0} %{?!_without_ipaclones: 1} # Want to build a vanilla kernel build without any non-upstream patches? -%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} +%define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} %if 0%{?fedora} # Kernel headers are being split out into a separate package @@ -1361,7 +1363,7 @@ ApplyOptionalPatch() mv linux-5.14-rc5-17-g761c6d7ec820 linux-%{KVERREL} cd linux-%{KVERREL} -cp -a %{SOURCE1} . +# cp -a %{SOURCE1} . %if !%{nopatches} @@ -2086,7 +2088,11 @@ BuildKernel() { %ifnarch armv7hl # Generate vmlinux.h and put it to kernel-devel path - bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h + + # tmp disabled for vanilla builds, as it fails on x86_64 with + # "Error: failed to load BTF from vmlinux: No such file or directory" + # (and yes, the file exists) + # bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h %endif # prune junk from kernel-devel |