diff options
| -rw-r--r-- | kernel.spec | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index b479bd642..f07deea5d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -24,7 +24,9 @@ Summary: The Linux kernel %global zipsed -e 's/\.ko$/\.ko.xz/' %endif -# define buildid .local +# % 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 @@ -53,12 +55,20 @@ Summary: The Linux kernel ## If this is a released kernel ## %if 0%{?released_kernel} +# Is it a -stable RC? +%define stable_rc 0 + + # Do we have a -stable update to apply? %define stable_update 5 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} %define stable_base %{stable_update} +%if 0%{?stable_rc} +# stable RCs are incremental patches, so we need the previous stable patch +%define stable_base %(echo $((%{stable_update} - 1))) +%endif %endif %define rpmversion 4.%{base_sublevel}.%{stable_update} @@ -89,7 +99,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 +108,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 +130,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,12 +138,17 @@ 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} +%if 0%{?stable_rc} +%define stable_rctag .rc%{stable_rc} +%define pkg_release 0%{stable_rctag}.%{fedora_build}%{?buildid}%{?dist} +%else %define pkg_release %{fedora_build}%{?buildid}%{?dist} +%endif %else @@ -172,7 +187,7 @@ Summary: The Linux kernel %if %{nopatches} %define with_bootwrapper 0 -%define variant -vanilla +#define variant -vanilla %endif %if !%{debugbuildsenabled} @@ -470,6 +485,10 @@ Source2001: cpupower.config %define stable_patch_00 patch-4.%{base_sublevel}.%{stable_base}.xz Source5000: %{stable_patch_00} %endif +%if 0%{?stable_rc} +%define stable_patch_01 patch-4.%{base_sublevel}.%{stable_update}-rc%{stable_rc}.xz +Patch01: %{stable_patch_01} +%endif # non-released_kernel case # These are automagically defined by the rcrev and gitrev values set up @@ -1228,6 +1247,9 @@ fi xzcat %{SOURCE5000} | patch -p1 -F1 -s git commit -a -m "Stable update" %endif +%if 0%{?stable_rc} +ApplyPatch %{stable_patch_01} +%endif # Drop some necessary files from the source dir into the buildroot cp $RPM_SOURCE_DIR/config-* . @@ -2528,6 +2550,9 @@ fi * Tue Dec 15 2015 Josh Boyer <jwboyer@fedoraproject.org> - CVE-2015-8543 ipv6: DoS via NULL pointer dereference (rhbz 1290475 1290477) +* Tue Dec 15 2015 Thorsten Leemhuis <fedora@leemhuis.info> +- drop the "stable" from release tag + * Mon Dec 14 2015 Josh Boyer <jwboyer@fedoraproject.org> - CVE-2015-7550 Race between read and revoke keys (rhbz 1291197 1291198) - CVE-XXXX-XXXX permission bypass on overlayfs (rhbz 1291329 1291332) @@ -3793,6 +3818,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.mainline.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: |