summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel.spec16
-rw-r--r--sources6
3 files changed, 11 insertions, 13 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 1027d7289..af24496a4 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 = 84
+RHEL_RELEASE = 85
#
# Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index dba8cd364..1a4126758 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -56,7 +56,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc5.20201124gitd5beb3140f91.84
+%global distro_build 0.rc5.20201125git127c501a03d5.85
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -97,13 +97,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.10.0
-%define pkgrelease 0.rc5.20201124gitd5beb3140f91.84
+%define pkgrelease 0.rc5.20201125git127c501a03d5.85
# This is needed to do merge window version magic
%define patchlevel 10
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20201124gitd5beb3140f91.84%{?buildid}%{?dist}
+%define specrelease 0.rc5.20201125git127c501a03d5.85%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -503,9 +503,7 @@ BuildRequires: kmod, patch, bash, tar, git-core
BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex
BuildRequires: net-tools, hostname, bc, elfutils-devel
-%if 0%{?fedora}
BuildRequires: dwarves
-%endif
BuildRequires: python3-devel
%if %{with_headers}
BuildRequires: rsync
@@ -594,7 +592,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20201124gitd5beb3140f91.tar.xz
+Source0: linux-20201125git127c501a03d5.tar.xz
Source1: Makefile.rhelver
@@ -1238,8 +1236,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20201124gitd5beb3140f91 -c
-mv linux-20201124gitd5beb3140f91 linux-%{KVERREL}
+%setup -q -n kernel-20201125git127c501a03d5 -c
+mv linux-20201125git127c501a03d5 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2691,7 +2689,7 @@ fi
#
#
%changelog
-* Tue Nov 24 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc5.20201124gitd5beb3140f91.84]
+* Wed Nov 25 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc5.20201125git127c501a03d5.85]
- Temporarily backout parallel xz script ("Justin M. Forbes")
* Fri Nov 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201120git4d02da974ea8.81]
diff --git a/sources b/sources
index a62632bb2..a293cb423 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20201124gitd5beb3140f91.tar.xz) = c9252bdbaabd177da1657f154857c4b832c4596c2a9e21cb54a2911877da3df56c3f800b7ea23f92185805ac495ba15a667ff67b795199f3c170974635f87045
-SHA512 (kernel-abi-whitelists-5.10.0-0.rc5.20201124gitd5beb3140f91.84.tar.bz2) = d0c437b362b29ffaf58bd7627564988b591a50f62884ff06d655139fb09b2302561ff9c172320dfd6e641dbc2f81b7f9ea840ab4b218cde994e2e5a55a2d80c5
-SHA512 (kernel-kabi-dw-5.10.0-0.rc5.20201124gitd5beb3140f91.84.tar.bz2) = b6a44113d97d3137809731d995e22fe3309377de3cea54cabbb8b65bfec969b0c3c69cb4355b3d16aad9c51129c74e1bd8cf4ccb8f0d9bba0208a84e598e4bab
+SHA512 (linux-20201125git127c501a03d5.tar.xz) = 73831cf2ccc23dc8fa840e897aa4596d1182d29c18c09a93a5ff13868d9721c441d3a686c218fb59d5d55007ac9d9861a2336bf0299ca50cbddb02e2ac045d0e
+SHA512 (kernel-abi-whitelists-5.10.0-0.rc5.20201125git127c501a03d5.85.tar.bz2) = feff207b2e43fd6f021592bdc91506d2c015336bc7cb094bea972aa31f36d9bbaf640629d8f07e66a620e8cb1da77f3f4b9475a43860aca32da50b2a6d66e724
+SHA512 (kernel-kabi-dw-5.10.0-0.rc5.20201125git127c501a03d5.85.tar.bz2) = 4d65cd89fce2acb86e6f51997777872e997e28356e73208fd9d9478377d014fa366f1877dab813362c5d996f8a746e156aa033a251ad109b161db5b791f87550