diff options
-rw-r--r-- | kernel-x86_64-fedora.config | 2 | ||||
-rwxr-xr-x | kernel.spec | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index bc15e3df4..4a55fef32 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1228,7 +1228,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 d65f411f3..ee8a75325 100755 --- a/kernel.spec +++ b/kernel.spec @@ -105,6 +105,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} @@ -140,7 +142,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 @@ -153,13 +155,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-whitelists %define with_kernel_abi_whitelists %{?_without_kernel_abi_whitelists: 0} %{?!_without_kernel_abi_whitelists: 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: # @@ -191,7 +193,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} @@ -209,7 +211,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 @@ -1320,7 +1322,7 @@ ApplyOptionalPatch() mv linux-5.13-rc4-48-g231bc5390667 linux-%{KVERREL} cd linux-%{KVERREL} -cp -a %{SOURCE1} . +# cp -a %{SOURCE1} . %if !%{nopatches} |