summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-03-23 09:23:04 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2022-03-23 09:23:04 +0100
commitbe4412b3f074fbd65dfc55422852657b53aac0c1 (patch)
tree3e599afd8fb3a1fc00ac132eb9759dfa0d1929f1
parentea07b7aad97f41bb4b451fc80bd3f102f0440053 (diff)
downloadkernel-be4412b3f074fbd65dfc55422852657b53aac0c1.tar.gz
kernel-be4412b3f074fbd65dfc55422852657b53aac0c1.tar.xz
kernel-be4412b3f074fbd65dfc55422852657b53aac0c1.zip
-rwxr-xr-xkernel.spec21
1 files changed, 13 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec
index 222235cc5..8f74fc7aa 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -119,6 +119,8 @@ Summary: The Linux kernel
%endif
# define buildid .local
+%define packager Thorsten Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories
+%define buildid .vanilla.1
%if 0%{?fedora}
@@ -126,6 +128,7 @@ Summary: The Linux kernel
%else
%define primary_target rhel
%endif
+%define fedorabase 5.17.0
# The kernel tarball/base version
%define kversion 5.17
@@ -138,7 +141,7 @@ Summary: The Linux kernel
%define patchlevel 17
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 300%{?buildid}%{?dist}
+%define specrelease 350%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -155,7 +158,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-zfcpdump (s390 specific kernel for zfcpdump)
%define with_zfcpdump %{?_without_zfcpdump: 0} %{?!_without_zfcpdump: 1}
# kernel-doc
@@ -185,7 +188,7 @@ Summary: The Linux kernel
# Only build the debug kernel (--with dbgonly):
%define with_dbgonly %{?_with_dbgonly: 1} %{?!_with_dbgonly: 0}
# Control whether we perform a compat. check against published ABI.
-#%define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1}
+%define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1}
# Temporarily disable kabi checks until RC.
%define with_kabichk 0
# Control whether we perform a compat. check against DUP ABI.
@@ -206,7 +209,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}
@@ -224,7 +227,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}
%if 0%{?fedora}
# Kernel headers are being split out into a separate package
@@ -835,8 +838,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{fedorabase}-%{distro_build}.tar.bz2
+Source301: kernel-kabi-dw-%{fedorabase}-%{distro_build}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
@@ -1395,7 +1398,7 @@ ApplyOptionalPatch()
mv linux-5.17 linux-%{KVERREL}
cd linux-%{KVERREL}
-cp -a %{SOURCE1} .
+# cp -a %{SOURCE1} .
%if !%{nopatches}
@@ -1406,6 +1409,8 @@ ApplyOptionalPatch linux-kernel-test.patch
# END OF PATCH APPLICATIONS
+head Makefile
+
# Any further pre-build tree manipulations happen here.
chmod +x scripts/checkpatch.pl