diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2014-09-27 21:31:06 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-07 15:19:06 +0200 |
commit | 80fa3d78074fa0b32ab35b88128ba703c6607562 (patch) | |
tree | d2ddf99700304a92a058473e30752f597442e45c /kernel.spec | |
parent | 45d42a6f7f55fb1abe535957f159081a895b3044 (diff) | |
download | kernel-80fa3d78074fa0b32ab35b88128ba703c6607562.tar.gz kernel-80fa3d78074fa0b32ab35b88128ba703c6607562.tar.xz kernel-80fa3d78074fa0b32ab35b88128ba703c6607562.zip |
Revert "Drop stable_rc macros"
This reverts commit 8a6c714a8c5421fc5985f2a14bc75bee3e381624.
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index ab629b699..2249b4645 100644 --- a/kernel.spec +++ b/kernel.spec @@ -57,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} @@ -135,7 +141,12 @@ Summary: The Linux kernel # 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 @@ -472,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 @@ -1196,6 +1211,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-* . |