rpms/kernel
8
2
Fork 4
Code Issues Pull Requests Releases Activity

Drop stable_rc macros

Browse Source 
We never use the stable_rc mechanism.  It just adds clutter to the spec
and in the rare case where we grab patches from a stable RC we've just
applied them via ApplyPatch.  Get rid of it.
This commit is contained in:
Josh Boyer 2014-01-15 11:00:40 -05:00
parent dd47c04c17
commit 8a6c714a8c
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel.spec
View File

@ -47,16 +47,10 @@ Summary: The Linux kernel
# Do we have a -stable update to apply? # Do we have a -stable update to apply?
%define stable_update 0 %define stable_update 0
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly # Set rpm version accordingly
%if 0%{?stable_update} %if 0%{?stable_update}
%define stablerev %{stable_update} %define stablerev %{stable_update}
%define stable_base %{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 %endif
%define rpmversion 3.%{base_sublevel}.%{stable_update} %define rpmversion 3.%{base_sublevel}.%{stable_update}
@ -136,12 +130,7 @@ Summary: The Linux kernel
# pkg_release is what we'll fill in for the rpm Release: field # pkg_release is what we'll fill in for the rpm Release: field
%if 0%{?released_kernel} %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} %define pkg_release %{fedora_build}%{?buildid}%{?dist}
%endif
%else %else
@ -512,10 +501,6 @@ Source2001: cpupower.config
%define stable_patch_00 patch-3.%{base_sublevel}.%{stable_base}.xz %define stable_patch_00 patch-3.%{base_sublevel}.%{stable_base}.xz
Patch00: %{stable_patch_00} Patch00: %{stable_patch_00}
%endif %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 # non-released_kernel case
# These are automagically defined by the rcrev and gitrev values set up # These are automagically defined by the rcrev and gitrev values set up
@ -1143,9 +1128,6 @@ cd linux-%{KVERREL}
%if 0%{?stable_base} %if 0%{?stable_base}
ApplyPatch %{stable_patch_00} ApplyPatch %{stable_patch_00}
%endif %endif
%if 0%{?stable_rc}
ApplyPatch %{stable_patch_01}
%endif
# Drop some necessary files from the source dir into the buildroot # Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* . cp $RPM_SOURCE_DIR/config-* .