diff options
-rwxr-xr-x | kernel.spec | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 4b2c95861..ed71f0d90 100755 --- a/kernel.spec +++ b/kernel.spec @@ -95,6 +95,10 @@ Summary: The Linux kernel %global zipsed -e 's/\.ko$/\.ko.xz/' %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 @@ -126,13 +130,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.1.8 %define patchversion 6.1 -%define pkgrelease 100 +%define pkgrelease 150 %define kversion 6 %define tarfile_release 6.1.8 # This is needed to do merge window version magic %define patchlevel 1 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 100%{?buildid}%{?dist} +%define specrelease 150%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.1.8 @@ -159,7 +163,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 @@ -210,7 +214,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} @@ -228,7 +232,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 @@ -1431,7 +1435,7 @@ ApplyOptionalPatch() mv linux-%{tarfile_release} linux-%{KVERREL} cd linux-%{KVERREL} -cp -a %{SOURCE1} . +# cp -a %{SOURCE1} . %if !%{nopatches} @@ -1442,6 +1446,8 @@ ApplyOptionalPatch linux-kernel-test.patch # END OF PATCH APPLICATIONS +head Makefile + # Any further pre-build tree manipulations happen here. chmod +x scripts/checkpatch.pl |