summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-09-23 07:17:31 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-09-23 07:17:31 +0200
commit0ff99063348bf7613106acfa95b5784efbbdf2a6 (patch)
treebb9113de3b3b7fff93dccd3bdbe565ae5a058bd0
parenta3cf1ea19f632ed31579804c10764f271126cc96 (diff)
parentc44a1b4e38ea3d8481a05c8bdb7f5356c3f03cfe (diff)
downloadkernel-0ff99063348bf7613106acfa95b5784efbbdf2a6.zip
kernel-0ff99063348bf7613106acfa95b5784efbbdf2a6.tar.gz
kernel-0ff99063348bf7613106acfa95b5784efbbdf2a6.tar.xz
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc2.20210922git92477dd1faa6.20.vanilla.1.fc34
-rw-r--r--Makefile.rhelver2
-rwxr-xr-xkernel.spec16
-rw-r--r--sources6
3 files changed, 11 insertions, 13 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 7399f96..48e74c8 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 18
+RHEL_RELEASE = 20
#
# Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index ee919a2..b133737 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -78,9 +78,9 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
-%global distro_build 0.rc2.18
+%global distro_build 0.rc2.20210922git92477dd1faa6.20
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -127,13 +127,13 @@ Summary: The Linux kernel
%define rpmversion 5.15.0
%define patchversion 5.15
-%define pkgrelease 0.rc2.18
+%define pkgrelease 0.rc2.20210922git92477dd1faa6.20
# This is needed to do merge window version magic
%define patchlevel 15
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.18%{?buildid}%{?dist}
+%define specrelease 0.rc2.20210922git92477dd1faa6.20%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -396,8 +396,6 @@ Summary: The Linux kernel
# sparse blows up on ppc
%ifnarch ppc64le
%define with_sparse 0
-# Temporarily turn off selftests as they are failing to build on ppc
-%define with_selftests 0
%endif
# zfcpdump mechanism is s390 only
@@ -676,7 +674,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.15-rc2.tar.xz
+Source0: linux-5.15-rc2-32-g92477dd1faa6.tar.xz
Source1: Makefile.rhelver
@@ -1362,8 +1360,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.15-rc2 -c
-mv linux-5.15-rc2 linux-%{KVERREL}
+%setup -q -n kernel-5.15-rc2-32-g92477dd1faa6 -c
+mv linux-5.15-rc2-32-g92477dd1faa6 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
diff --git a/sources b/sources
index 6fa07ab..b4da23c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.15-rc2.tar.xz) = d2d2372d224ada4e61e35fa2deb0d1550012f6f20bb8b3c10d8fbe736288317a9cbb509e3613f9c4aa3b679374f8fbe01cef17a23dc65293d57cb7c0ebe568c7
-SHA512 (kernel-abi-stablelists-5.15.0-0.rc2.18.tar.bz2) = f5de9764ae6ccf257129083d48bc65d8071d242bd7ef2bc8ec7117b453a19ce10a431588674b2011d4d94bf57f3259ebdc922904ca9dc4de1d2ddadde8c4c304
-SHA512 (kernel-kabi-dw-5.15.0-0.rc2.18.tar.bz2) = b19cef0a1d93afe6f65cee02101bc31e7da17f744878736d1b3293e637e8af5c619535ab346788b6d9283125e13a5344ed33c0f1d798ffae5f9b38d93b6d73e7
+SHA512 (linux-5.15-rc2-32-g92477dd1faa6.tar.xz) = d3fdcce040082cc0cbd9ff8b726324455af9292558f958de78bb4c267294d500b90584d5cc1e8075f061772b1fbd1a944aa2fd17daacb8fffc5680a11353afe7
+SHA512 (kernel-abi-stablelists-5.15.0-0.rc2.20210922git92477dd1faa6.20.tar.bz2) = cd97c074b0c04a9b95695f72ef07e3e76e84c49bc4f52a41bfbf4de2564e890b49f13be41ab5071e7197942ecc6df225472f61134a2d66d960665b8ad0df5ac9
+SHA512 (kernel-kabi-dw-5.15.0-0.rc2.20210922git92477dd1faa6.20.tar.bz2) = 837aa0c7a3c843f6e8f675a109a6498e888a91721535d7b91afa6ed489feadc88afa02404b2992acba9754ca185d80485bfb9901d30473a0b8de13e5f488199e