From b4f7fac4576a46299e694d73623df32d79c49e7f Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Wed, 28 Apr 2021 17:45:44 -0400 Subject: [PATCH] kernel-5.12.0-1.el9 * Wed Apr 28 2021 Herton R. Krzesinski [5.12.0-1.el9] - v5.12 rebase [1930810 1930834 1930857] - Reset the counter as we start the 5.13 merge window (Justin M. Forbes) - Create ark-latest branch last for CI scripts (Don Zickus) Resolves: rhbz#1930810, rhbz#1930834, rhbz#1930857 Signed-off-by: Herton R. Krzesinski --- Makefile.rhelver | 2 +- kernel.spec | 22 ++++++++++++++-------- sources | 6 +++--- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index c0d7253..7fb2464 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 = 193 +RHEL_RELEASE = 1 # # Early y+1 numbering diff --git a/kernel.spec b/kernel.spec index 5fe67a7..c757f6e 100755 --- a/kernel.spec +++ b/kernel.spec @@ -66,7 +66,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc8.193 +%global distro_build 1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -107,13 +107,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.12.0 -%define pkgrelease 0.rc8.193 +%define pkgrelease 1 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc8.193%{?buildid}%{?dist} +%define specrelease 1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -622,7 +622,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.12.0-0.rc8.193.tar.xz +Source0: linux-5.12.0-1.tar.xz Source1: Makefile.rhelver @@ -1276,8 +1276,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.12.0-0.rc8.193 -c -mv linux-5.12.0-0.rc8.193 linux-%{KVERREL} +%setup -q -n kernel-5.12.0-1 -c +mv linux-5.12.0-1 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2791,8 +2791,14 @@ fi # # %changelog -* Thu Apr 22 2021 Herton R. Krzesinski [5.12.0-0.rc8.193] -- v5.12-rc8-1-g7af08140979a rebase +* Wed Apr 28 2021 Herton R. Krzesinski [5.12.0-1.el9] +- v5.12 rebase + +* Tue Apr 27 2021 Fedora Kernel Team [5.12.0-1] +- Reset the counter as we start the 5.13 merge window (Justin M. Forbes) + +* Mon Apr 26 2021 Fedora Kernel Team [5.12.0-197] +- Create ark-latest branch last for CI scripts (Don Zickus) * Wed Apr 21 2021 Fedora Kernel Team [5.12.0-0.rc8.20210421git7af08140979a.193] - Replace /usr/libexec/platform-python with /usr/bin/python3 (David Ward) diff --git a/sources b/sources index d4d0da3..6096edd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.12.0-0.rc8.193.tar.xz) = 6ed8b1b901a7865e9decf4c4e3eac599ca417b338906d042f47d34660a3957f1527076223019658fd40dda2322b40b7c8de0630ec1193591e73a351b56ff2235 -SHA512 (kernel-abi-whitelists-5.12.0-0.rc8.193.tar.bz2) = 12943b067d3140db50ad302dfc40ca62630b9882d2cea753af104e2ddbcf4688f5c424ff53f45d8381f37a196e68a898eea44ab29e5f185437b377095a3c243a -SHA512 (kernel-kabi-dw-5.12.0-0.rc8.193.tar.bz2) = 31ab0b6aefcb422fa02c06c97a7dcb046db0096d211696c3f906c3c46d372e2cf10ae2eba2b1a169024706b40d05c327dfa1fa936632f4cbadf2931ade8a0912 +SHA512 (linux-5.12.0-1.tar.xz) = 5f2391b3bf12c7d136f5b3a9e9cc02e1a6385e677a0a5d277f7f929866080e7b5ac80bb6b194d277a98e59a47d581fca2ba78574029c999b60394cd924048cb1 +SHA512 (kernel-abi-whitelists-5.12.0-1.tar.bz2) = 699ddf76f8e73439772119d76ef333c34ad0269ee0769b44149ac9abf97ac60346ce34669ced491b0c95f3593f00c9ee52c93a129cc27ac1e05ad45bad300f74 +SHA512 (kernel-kabi-dw-5.12.0-1.tar.bz2) = f356c500777ed5f4792e79d751ef88cfd79093e76b1cd496be4bc38451afba6af70a4f106270b099ab02a6410be93f0221e58d5f9080e807fbaad51b1578f1f4