diff options
| -rwxr-xr-x | kernel.spec | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 69bb953c3..d630015dd 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 @@ -124,13 +128,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.19.1 %define patchversion 5.19 -%define pkgrelease 300 +%define pkgrelease 325 %define kversion 5 %define tarfile_release 5.19.1 # This is needed to do merge window version magic %define patchlevel 19 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 300%{?buildid}%{?dist} +%define specrelease 325%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 5.19.1 @@ -153,7 +157,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 @@ -204,7 +208,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} @@ -222,7 +226,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 @@ -646,7 +650,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} @@ -1427,7 +1431,7 @@ ApplyOptionalPatch() mv linux-%{tarfile_release} linux-%{KVERREL} cd linux-%{KVERREL} -cp -a %{SOURCE1} . +# cp -a %{SOURCE1} . %if !%{nopatches} @@ -1438,6 +1442,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 @@ -7195,6 +7201,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 |