summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-04-28 14:48:30 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-04-28 14:48:30 +0200
commitb882163f98fbb3dcc9ff5d494827ea4abbaf7a12 (patch)
tree1943712899cc16aa7adee0972f753ac16b06febb
parentf7ba01a9677fffa21535bc6cdcad930a858d6106 (diff)
parent5a34ebde9f6e52bee966789ed3dc196af0724a20 (diff)
downloadkernel-b882163f98fbb3dcc9ff5d494827ea4abbaf7a12.tar.gz
kernel-b882163f98fbb3dcc9ff5d494827ea4abbaf7a12.tar.xz
kernel-b882163f98fbb3dcc9ff5d494827ea4abbaf7a12.zip
merge master
-rw-r--r--kernel.spec2
-rw-r--r--patch-5.7.0-redhat.patch2
-rw-r--r--sources2
3 files changed, 3 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index 21769cb1c..a64479e18 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,7 +71,7 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.7.0
-%define pkgrelease 0.rc3.1.test
+%define pkgrelease 0.rc3.1
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc3.1%{?buildid}%{?dist}
diff --git a/patch-5.7.0-redhat.patch b/patch-5.7.0-redhat.patch
index 254bdde33..f45814499 100644
--- a/patch-5.7.0-redhat.patch
+++ b/patch-5.7.0-redhat.patch
@@ -1,6 +1,6 @@
From 8474ffe83a89d7b5d2c6515875a308ff682df6f9 Mon Sep 17 00:00:00 2001
From: Kernel Team <kernel-team@fedoraproject.org>
-Date: Sun, 26 Apr 2020 21:08:55 -0500
+Date: Mon, 27 Apr 2020 09:11:12 -0500
Subject: [PATCH] Include Makefile.rhelver
Used to set the RHEL version.
diff --git a/sources b/sources
index 18c219cd1..5de83246b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (linux-5.7-rc3.tar.xz) = 8737a7534fc01259ab9c374fa55edd39a13cd1a36126b38ad48a0aeb4a360988dca2523d812056a0dc080fc5c79e211dd91f20a750a6531c8039b980cb25479f
-SHA512 (kernel-abi-whitelists-5.7.0-0.rc3.1.tar.bz2) = 3489dacc138d38ded54e42020d16ab79bca6c5945c6247f543b7b596130463f53ad18bceff346f8eced0f8376d73da1b96433deb52b24eea0d47d54238ae4ef5
+SHA512 (kernel-abi-whitelists-5.7.0-0.rc3.1.tar.bz2) = ea483c8d5469c70ca7e0f0f0b01f65948ee2840d6fd5da125e423931c12608a3954dd63124727f2d4dafe166c388fed8fd031ed512828c907bb36834374104c6
SHA512 (kernel-kabi-dw-5.7.0-0.rc3.1.tar.bz2) = 535c199c6ca214be1fe13dc39728eb970b976eb8d1f261a03c50a240522655777c11eaafc3e268affdb8e774a561f28ab8d8e355207552c42bdba7b1be014994