diff options
| -rw-r--r-- | kernel.spec | 62 |
1 files changed, 48 insertions, 14 deletions
diff --git a/kernel.spec b/kernel.spec index a34af82ba..f73d60247 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 @@ -55,10 +57,16 @@ Summary: The Linux kernel # Do we have a -stable update to apply? %define stable_update 0 +# Is it a -stable RC? +%define stable_rc 0 # 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 +97,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 +106,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 +128,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 +136,17 @@ Summary: The Linux kernel %define debugbuildsenabled 0 # 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 +185,7 @@ Summary: The Linux kernel %if %{nopatches} %define with_bootwrapper 0 -%define variant -vanilla +#define variant -vanilla %endif %if !%{debugbuildsenabled} @@ -470,6 +483,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-3.%{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 @@ -1175,6 +1192,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-* . @@ -1683,9 +1703,9 @@ chmod +x tools/power/cpupower/utils/version-gen.sh pushd tools/thermal/tmon/ %{make} popd -pushd tools/iio/ -%{make} -popd +#pushd tools/iio/ +#{make} +#popd %endif # In the modsign case, we do 3 things. 1) We check the "flavour" and hard @@ -1853,9 +1873,9 @@ install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower pushd tools/thermal/tmon make INSTALL_ROOT=%{buildroot} install popd -pushd tools/iio -make INSTALL_ROOT=%{buildroot} install -popd +#pushd tools/iio +#make INSTALL_ROOT=%{buildroot} install +#popd %endif %if %{with_bootwrapper} @@ -2047,9 +2067,9 @@ fi %{_mandir}/man8/turbostat* %endif %{_bindir}/tmon -%{_bindir}/iio_event_monitor -%{_bindir}/iio_generic_buffer -%{_bindir}/lsiio +#{_bindir}/iio_event_monitor +#{_bindir}/iio_generic_buffer +#{_bindir}/lsiio %endif %if %{with_debuginfo} @@ -2445,6 +2465,9 @@ fi * Wed Aug 03 2016 Laura Abbott <labbott@redhat.com> - 4.8.0-0.rc0.git5.1 - Linux v4.7-11470-gd52bd54 +* Tue Aug 02 2016 Thorsten Leemhuis <fedora [AT] leemhuis.info> +- Disable iio tools, as they fail to build on F24 and F23 + * Tue Aug 2 2016 Hans de Goede <jwrdegoede@fedoraproject.org> - Sync skylake hdaudio __unclaimed_reg WARN_ON fix with latest upstream version - Drop drm-i915-skl-Add-support-for-the-SAGV-fix-underrun-hangs.patch for now @@ -3253,6 +3276,9 @@ fi * Wed Dec 16 2015 Laura Abbott <labbott@redhat.com> - Enable a set of RDMA drivers (rhbz 1291902) +* Wed Dec 16 2015 Thorsten Leemhuis <fedora@leemhuis.info> +- drop the "mainline" from release tag + * Wed Dec 16 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc5.git1.1 - Linux v4.4-rc5-18-gedb42dc @@ -4743,6 +4769,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: |