summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel.spec35
-rw-r--r--sources1
2 files changed, 17 insertions, 19 deletions
diff --git a/kernel.spec b/kernel.spec
index 03d2abec6..7240fdbbd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -88,6 +88,8 @@ Summary: The Linux kernel
%endif
# define buildid .local
+%define packager Thorsten 'knurd' Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories
+%define buildid .vanilla.1
%if 0%{?fedora}
@@ -96,7 +98,7 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-%define rpmversion 5.10.0
+%define rpmversion 5.10.1
%define pkgrelease 98
# This is needed to do merge window version magic
@@ -120,7 +122,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
@@ -133,7 +135,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)
@@ -170,7 +172,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}
@@ -188,7 +190,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).
@@ -260,7 +262,7 @@ Summary: The Linux kernel
%endif
%if %{nopatches}
-%define variant -vanilla
+#define variant -vanilla
%endif
%if !%{debugbuildsenabled}
@@ -719,8 +721,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-whitelists-%{rpmversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-whitelists-5.10.0-%{distro_build}.tar.bz2
+Source301: kernel-kabi-dw-5.10.0-%{distro_build}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
@@ -737,6 +739,8 @@ Source4000: README.rst
## Patches needed for building this package
+Patch1: patch-5.10.1.xz
+
%if !%{nopatches}
Patch1: patch-%{rpmversion}-redhat.patch
@@ -1238,7 +1242,10 @@ ApplyOptionalPatch()
mv linux-5.10 linux-%{KVERREL}
cd linux-%{KVERREL}
-cp -a %{SOURCE1} .
+# cp -a %{SOURCE1} .
+
+ApplyPatch patch-5.10.1.xz
+head Makefile
%if !%{nopatches}
@@ -1561,7 +1568,6 @@ BuildKernel() {
(cd $RPM_BUILD_ROOT/lib/modules/$KernelVer ; ln -s build source)
# dirs for additional modules per module-init-tools, kbuild/modules.txt
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates
- mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/weak-updates
# CONFIG_KERNEL_HEADER_TEST generates some extra files in the process of
# testing so just delete
find . -name *.h.s -delete
@@ -2391,10 +2397,6 @@ fi\
#
%define kernel_variant_posttrans() \
%{expand:%%posttrans %{?1:%{1}-}core}\
-if [ -x %{_sbindir}/weak-modules ]\
-then\
- %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\
-fi\
/bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
%{nil}
@@ -2424,10 +2426,6 @@ fi}\
%define kernel_variant_preun() \
%{expand:%%preun %{?1:%{1}-}core}\
/bin/kernel-install remove %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
-if [ -x %{_sbindir}/weak-modules ]\
-then\
- %{_sbindir}/weak-modules --remove-kernel %{KVERREL}%{?1:+%{1}} || exit $?\
-fi\
%{nil}
%kernel_variant_preun
@@ -2640,7 +2638,6 @@ fi
/lib/modules/%{KVERREL}%{?3:+%{3}}/source\
/lib/modules/%{KVERREL}%{?3:+%{3}}/updates\
/lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\
-/lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\
%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\
%if %{1}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\
diff --git a/sources b/sources
index a1259c417..41cc75f23 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
SHA512 (linux-5.10.tar.xz) = c28d52bc0c1e2c99017ceeca0bf2e622427f3416e0692090b01f65e3b3a5bce0e3e52ce3cee15d71e84fcb965bd48bdfcccb818c0105035d712ebd07afde9452
SHA512 (kernel-abi-whitelists-5.10.0-98.tar.bz2) = e3c85bb9cf256d1695035c1fc6197e85b9c74c021a67fd9c79e3422af6d0334e81aaf6b6c6857245bf4081f37a30638abe222c7ae9a94ec92eda02192a83aa90
SHA512 (kernel-kabi-dw-5.10.0-98.tar.bz2) = 6e284faa972833261e5c9090f62efb1d3ed250d994e3e3e630e7d78b65a563799634738986f7640809557470c8edfc6250fc036b59763619f4e06a0767f7a772
+SHA512 (patch-5.10.1.xz) = 4fa17c2525cf67f71bcdd232cd98f1a00cf9596987e73909ef9638b9e74886c4d752375ba1b9b8020f544b2d6fac23630fc090111a4e79b880dbb81629bd1503