diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-03 06:47:01 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-03 06:47:01 +0200 |
commit | b006d4c8a7650c95a1504f20f82569221ad8db24 (patch) | |
tree | c1f49e209915c6f4a2574303323a0fb63ea45082 | |
parent | 82caceb61ea63124ff4697e630833bba0b61eccc (diff) | |
parent | 6493c5a9c4cf782738a690a9691f6cf64e847dcd (diff) | |
download | kernel-b006d4c8a7650c95a1504f20f82569221ad8db24.tar.gz kernel-b006d4c8a7650c95a1504f20f82569221ad8db24.tar.xz kernel-b006d4c8a7650c95a1504f20f82569221ad8db24.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc3.20200902git9c7d619be5a0.1.vanilla.2.fc34kernel-5.9.0-0.rc3.20200902git9c7d619be5a0.1.vanilla.2.fc33kernel-5.9.0-0.rc3.20200902git9c7d619be5a0.1.vanilla.2.fc32kernel-5.9.0-0.rc3.20200902git9c7d619be5a0.1.vanilla.2.fc31
-rw-r--r-- | kernel.spec | 16 | ||||
-rw-r--r-- | sources | 6 |
2 files changed, 13 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec index adc6aab56..2fce1c985 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.rc3.20200901gitb51594df17d0.1 +%global distro_build 0.rc3.20200902git9c7d619be5a0.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,13 +71,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.9.0 -%define pkgrelease 0.rc3.20200901gitb51594df17d0.1 +%define pkgrelease 0.rc3.20200902git9c7d619be5a0.1 # This is needed to do merge window version magic %define patchlevel 9 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20200901gitb51594df17d0.1%{?buildid}%{?dist} +%define specrelease 0.rc3.20200902git9c7d619be5a0.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-20200901gitb51594df17d0.tar.xz +Source0: linux-20200902git9c7d619be5a0.tar.xz Source1: Makefile.rhelver @@ -1287,8 +1287,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200901gitb51594df17d0 -c -mv linux-20200901gitb51594df17d0 linux-%{KVERREL} +%setup -q -n kernel-20200902git9c7d619be5a0 -c +mv linux-20200902git9c7d619be5a0 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2787,6 +2787,10 @@ fi # # %changelog +* Wed Sep 02 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200902git9c7d619be5a0.1] +- 9c7d619be5a0 rebase +- Updated changelog for the release based on b51594df17d0 (Fedora Kernel Team) + * Tue Sep 01 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200901gitb51594df17d0.1] - b51594df17d0 rebase - Fedora filter update ("Justin M. Forbes") @@ -1,3 +1,3 @@ -SHA512 (linux-20200901gitb51594df17d0.tar.xz) = 1e8d531d664decb6fd2f3551653fcf70fa37ccf0829d6f0b07e926d05a2db140b8306f21c406ad34fb60268dbd2a6004be4336fd8cb554c3bf32fa5a35a040b0 -SHA512 (kernel-abi-whitelists-5.9.0-0.rc3.20200901gitb51594df17d0.1.tar.bz2) = a316cc3bd337cc50af752d67b564d2bc9065a15d9f77a27655ff3bc96b06f00bb1dbb57fcee25e7da7a64eb2412f340643bfabc2c165ccccddd1973d6f785b72 -SHA512 (kernel-kabi-dw-5.9.0-0.rc3.20200901gitb51594df17d0.1.tar.bz2) = 282572842fd64c20efd5b338e080f34909c801814ee1c0f8f4fd0e3011b45885cb8d2ab77a99caf6b33f9c74203c304be74abf12bdf5d94801148d8017ab81fe +SHA512 (linux-20200902git9c7d619be5a0.tar.xz) = e76d90f0139581c573a9e6d58ce35e16481027d485c865057ea451a52b1fe1ddb9c046b23dba7def7ac7dd0aea8fe102c9228a174ce8036ddae3c9d5e61bb61a +SHA512 (kernel-abi-whitelists-5.9.0-0.rc3.20200902git9c7d619be5a0.1.tar.bz2) = 4b9b78c56d2f2a7b4abc86a6ad8cb644703ba835530c4d6debc7ab1f78f5bd994bd91f6082cbe1ac846f42044f7276823353c4419646b4fe0022f3e8a5a0f07a +SHA512 (kernel-kabi-dw-5.9.0-0.rc3.20200902git9c7d619be5a0.1.tar.bz2) = b9a4ff9ec696c1f5abe51bb02697c087f03036d9859013a8f18afa34b56a6fef3a6c36b565c3cc25a459d1573eef81ec53dcf8861f3b8a49d209bcecee39eb90 |