vanillafy:kernel-4.13.2-300.vanilla.knurd.1.fc27

- 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/dnf
- revert "Drop stable_rc macros" (8a6c714a8c)

Conflicts:
	kernel.spec

1 files changed, 34 insertions, 5 deletions

diff --git a/kernel.spec b/kernel.spec
index 9b55307bd..b24ceb323 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
@@ -52,6 +54,8 @@ 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 2
@@ -59,6 +63,10 @@ Summary: The Linux kernel
 %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}
@@ -497,6 +510,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
@@ -1231,6 +1248,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/kernel-*.config .
@@ -4304,6 +4324,15 @@ fi
 - Fix tegra nouveau module load (thank kwizart for reference)
 - PowerPC Little Endian ToC fix
 
+* 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/dnf
+- revert "Drop stable_rc macros" (8a6c714a8c)
+
 ###
 # The following Emacs magic makes C-c C-e use UTC dates.
 # Local Variables: