diff options
| -rwxr-xr-x | kernel.spec | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 604cffdf7..2c0a908dc 100755 --- a/kernel.spec +++ b/kernel.spec @@ -93,11 +93,16 @@ 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 %define primary_target rhel %endif +%define fedorabase 5.18.4 # # genspec.sh variables @@ -130,7 +135,7 @@ Summary: The Linux kernel # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 200%{?buildid}%{?dist} +%define specrelease 250%{?buildid}%{?dist} # # End of genspec.sh variables @@ -151,7 +156,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 @@ -202,7 +207,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} @@ -220,7 +225,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 @@ -829,8 +834,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2 -Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2 +Source300: kernel-abi-stablelists-%{fedorabase}-%{pkgrelease}.tar.bz2 +Source301: kernel-kabi-dw-%{fedorabase}-%{pkgrelease}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service @@ -1389,7 +1394,7 @@ ApplyOptionalPatch() mv linux-%{tarfile_release} linux-%{KVERREL} cd linux-%{KVERREL} -cp -a %{SOURCE1} . +# cp -a %{SOURCE1} . %if !%{nopatches} @@ -1400,6 +1405,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 @@ -6918,6 +6925,14 @@ fi - redhat: bump RHEL_MAJOR and add the changelog file for it (Herton R. Krzesinski) - redhat: add documentation about the os-build rebase process (Herton R. Krzesinski) +* Sat Oct 20 2012 Thorsten Leemhuis <fedora@leemhuis.info> +- add buildid ".vanilla.knurd.1" +- switch defines to build + - a vanilla kernel without debuging + - no debug kernel and no debuginfo packages, to big to handle for me right now +- disable the variant macro as that adds "-vanilla" to %%name, which confuses + fedpkg and prevents installonly handling of packages in yum + # The following bit is important for automation so please do not remove # END OF CHANGELOG |