diff options
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index f8846a66a..4bed5fdad 100755 --- a/kernel.spec +++ b/kernel.spec @@ -93,6 +93,10 @@ Summary: The Linux kernel # for parallel xz processes, replace with 1 to go back to single process %endif +# define buildid .local +%define packager Thorsten Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories +%define buildid .vanilla.1 + %if 0%{?fedora} %define primary_target fedora %else @@ -157,7 +161,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 @@ -208,7 +212,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} @@ -226,7 +230,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 @@ -651,7 +655,7 @@ BuildConflicts: dwarves < 1.13 %undefine _debugsource_packages %undefine _debuginfo_subpackages %global _find_debuginfo_opts -r -%global _missing_build_ids_terminate_build 1 +%global _missing_build_ids_terminate_build 0 %global _no_recompute_build_ids 1 %endif %if %{with_kabidwchk} || %{with_kabidw_base} @@ -1432,7 +1436,7 @@ ApplyOptionalPatch() mv linux-%{tarfile_release} linux-%{KVERREL} cd linux-%{KVERREL} -cp -a %{SOURCE1} . +# cp -a %{SOURCE1} . %if !%{nopatches} @@ -1678,7 +1682,7 @@ BuildKernel() { %endif # Remove large intermediate files we no longer need to save space - rm vmlinux.o .tmp_vmlinux.btf + rm vmlinux.o .tmp_vmlinux.btf || : # Start installing the results install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer @@ -2203,7 +2207,12 @@ BuildKernel() { # Generate vmlinux.h and put it to kernel-devel path # zfcpdump build does not have btf anymore if [ "$Variant" != "zfcpdump" ]; then - bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h + # disabled for vanilla builds, to avoid a build problem: + # + # + bpftool btf dump file vmlinux format c + # Error: failed to load BTF from vmlinux: Unknown error -2 + # bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h + : fi %endif |