summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-07-27 19:41:34 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-07-27 19:41:34 +0200
commit1c236df71c72ab37b46eae8ed7a48c96866ce78d (patch)
treeb04ad8b42f349b3d0aae9952a26bbfa4f0384491 /kernel.spec
parent13f37e7fe398411ef06f9bc489678bca23854e93 (diff)
parent38ae8ad573eed85916454766404b352bb53c56bc (diff)
downloadkernel-1c236df71c72ab37b46eae8ed7a48c96866ce78d.tar.gz
kernel-1c236df71c72ab37b46eae8ed7a48c96866ce78d.tar.xz
kernel-1c236df71c72ab37b46eae8ed7a48c96866ce78d.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc7.1.vanilla.1.fc33kernel-5.8.0-0.rc7.1.vanilla.1.fc32kernel-5.8.0-0.rc7.1.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec29
1 files changed, 23 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec
index 51e62f5b6..f4655f6dc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc6.20200723gitd15be546031c.1
+%global distro_build 0.rc7.1
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -71,13 +71,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.8.0
-%define pkgrelease 0.rc6.20200723gitd15be546031c.1
+%define pkgrelease 0.rc7.1
# This is needed to do merge window version magic
%define patchlevel 8
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.20200723gitd15be546031c.1%{?buildid}%{?dist}
+%define specrelease 0.rc7.1%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -569,7 +569,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200723gitd15be546031c.tar.xz
+Source0: linux-5.8-rc7.tar.xz
Source1: Makefile.rhelver
@@ -1310,8 +1310,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20200723gitd15be546031c -c
-mv linux-20200723gitd15be546031c linux-%{KVERREL}
+%setup -q -n kernel-5.8-rc7 -c
+mv linux-5.8-rc7 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2848,6 +2848,23 @@ fi
#
#
%changelog
+* Mon Jul 27 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc7.1]
+- v5.8-rc7 rebase
+- Updated changelog for the release based on 04300d66f0a0 (Fedora Kernel Team)
+
+* Sun Jul 26 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc6.20200726git04300d66f0a0.1]
+- 04300d66f0a0 rebase
+- Updated changelog for the release based on 23ee3e4e5bd2 (Fedora Kernel Team)
+
+* Sat Jul 25 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc6.20200725git23ee3e4e5bd2.1]
+- 23ee3e4e5bd2 rebase
+- Enable CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG ("Justin M. Forbes")
+- Updated changelog for the release based on f37e99aca03f (Fedora Kernel Team)
+
+* Fri Jul 24 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc6.20200724gitf37e99aca03f.1]
+- f37e99aca03f rebase
+- Updated changelog for the release based on d15be546031c (Fedora Kernel Team)
+
* Thu Jul 23 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc6.20200723gitd15be546031c.1]
- d15be546031c rebase
- fedora: arm: Update some meson config options (Peter Robinson)