From 3bde486fc3174c8368d9c04ae4d54b0800abf8c7 Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <fedora@leemhuis.info>
Date: Thu, 13 Aug 2020 20:38:32 +0200
Subject: vanillify

---
 kernel.spec | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/kernel.spec b/kernel.spec
index e1aaeea57..726390bca 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -57,6 +57,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
 
 %if 0%{?fedora}
 %define primary_target fedora
@@ -80,7 +82,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 300
+%global baserelease 350
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -91,12 +93,19 @@ 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 1
 # 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 5.%{base_sublevel}.%{stable_update}
 
@@ -127,7 +136,7 @@ Summary: The Linux kernel
 # kernel PAE (only valid for 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-doc
 %define with_doc       %{?_without_doc:       0} %{?!_without_doc:       1}
 # kernel-headers
@@ -140,7 +149,7 @@ Summary: The Linux kernel
 # bpf tool
 %define with_bpftool   %{?_without_bpftool:   0} %{?!_without_bpftool:   1}
 # kernel-debuginfo
-%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
+%define with_debuginfo %{?_with_debuginfo:    1} %{?!_with_debuginfo:    0}
 # Want to build a the vsdo directories installed
 %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
 # kernel-zfcpdump (s390 specific kernel for zfcpdump)
@@ -177,7 +186,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}
 
 # verbose build, i.e. no silent rules and V=1
 %define with_verbose %{?_with_verbose:        1} %{?!_with_verbose:      0}
@@ -195,7 +204,7 @@ Summary: The Linux kernel
 %define with_ipaclones %{?_without_ipaclones: 0} %{?!_without_ipaclones: 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}
 
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
@@ -227,7 +236,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
 
@@ -290,7 +304,7 @@ Summary: The Linux kernel
 %endif
 
 %if %{nopatches}
-%define variant -vanilla
+#define variant -vanilla
 %endif
 
 %if !%{debugbuildsenabled}
@@ -777,6 +791,10 @@ Source1000: kernel-local
 %define    stable_patch_00  patch-5.%{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
@@ -1518,6 +1536,9 @@ fi
 xzcat %{SOURCE5000} | patch -p1 -F1 -s
 git commit -a -m "Stable update"
 %endif
+%if 0%{?stable_rc}
+ApplyPatch %{stable_patch_01}
+%endif
 
 # Note: Even in the "nopatches" path some patches (build tweaks and compile
 # fixes) will always get applied; see patch defition above for details
-- 
cgit