diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2013-11-27 18:25:46 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-07 15:17:52 +0200 |
commit | 45d42a6f7f55fb1abe535957f159081a895b3044 (patch) | |
tree | 92adecd105e4b42cdc1f0a8bc2ce3d73016088ef | |
parent | 9510c8110910af408da21717eab928bf0d47284f (diff) | |
download | kernel-45d42a6f7f55fb1abe535957f159081a895b3044.tar.gz kernel-45d42a6f7f55fb1abe535957f159081a895b3044.tar.xz kernel-45d42a6f7f55fb1abe535957f159081a895b3044.zip |
fixmerge conflicts
-rw-r--r-- | kernel.spec | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec index c2c168bc8..ab629b699 100644 --- a/kernel.spec +++ b/kernel.spec @@ -25,6 +25,8 @@ Summary: The Linux kernel %endif # define buildid .local +%define packager Thorsten Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories +%define buildid .vanilla.knurd.1 # baserelease defines which build revision of this kernel version we're # building. We used to call this fedora_build, but the magical name @@ -89,7 +91,7 @@ Summary: The Linux kernel # kernel PAE (only valid for i686 (PAE) and 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-headers %define with_headers %{?_without_headers: 0} %{?!_without_headers: 1} %define with_cross_headers %{?_without_cross_headers: 0} %{?!_without_cross_headers: 1} @@ -98,7 +100,7 @@ Summary: The Linux kernel # tools %define with_tools %{?_without_tools: 0} %{?!_without_tools: 1} # kernel-debuginfo -%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} +%define with_debuginfo %{?_with_debuginfo: 1} %{?!_with_debuginfo: 0} # kernel-bootwrapper (for creating zImages from kernel + initrd) %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1} # Want to build a the vsdo directories installed @@ -120,7 +122,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} # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). @@ -128,7 +130,7 @@ Summary: The Linux kernel %define debugbuildsenabled 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} # pkg_release is what we'll fill in for the rpm Release: field %if 0%{?released_kernel} @@ -172,7 +174,7 @@ Summary: The Linux kernel %if %{nopatches} %define with_bootwrapper 0 -%define variant -vanilla +#define variant -vanilla %endif %if !%{debugbuildsenabled} @@ -3899,6 +3901,7 @@ fi * Mon Apr 27 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc1.git0.1 - Linux v4.1-rc1 - Disable debugging options. +<<<<<<< HEAD * Fri Apr 24 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git14.1 - Linux v4.0-10976-gd56a669ca59c @@ -4683,6 +4686,14 @@ fi - Linux v3.17-rc2-9-g68e370289c29 - Reenable debugging options. +* Sat Oct 20 2012 Thorsten Leemhuis <fedora@leemhuis.info> - 3.7.0-0.rc1.git3.1.vanilla.mainline.knurd.1 +- 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 Emacs magic makes C-c C-e use UTC dates. # Local Variables: |