diff --git a/Makefile.rhelver b/Makefile.rhelver index bee55fb24..a8e2c9884 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 = 24 +RHEL_RELEASE = 25 # # Early y+1 numbering diff --git a/kernel.spec b/kernel.spec index 3d3684635..5b30960f2 100755 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc2.20210721git8cae8cd89f05.24 +%global distro_build 0.rc2.20210722git3d5895cd3517.25 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -124,13 +124,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 0.rc2.20210721git8cae8cd89f05.24 +%define pkgrelease 0.rc2.20210722git3d5895cd3517.25 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20210721git8cae8cd89f05.24%{?buildid}%{?dist} +%define specrelease 0.rc2.20210722git3d5895cd3517.25%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -671,7 +671,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14-rc2-1-g8cae8cd89f05.tar.xz +Source0: linux-5.14-rc2-34-g3d5895cd3517.tar.xz Source1: Makefile.rhelver @@ -1356,8 +1356,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-rc2-1-g8cae8cd89f05 -c -mv linux-5.14-rc2-1-g8cae8cd89f05 linux-%{KVERREL} +%setup -q -n kernel-5.14-rc2-34-g3d5895cd3517 -c +mv linux-5.14-rc2-34-g3d5895cd3517 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . diff --git a/sources b/sources index fcc15d9b5..2ec878dd3 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.14.0-0.rc0.20210707git77d34a4683b0.12.tar.bz2) = 411f2a75d47633c61eb416d270a293d6965cf69b05fdada93480765da88185cea0378820f53b66fd405549374a5094868530f2451d1d2e6eda970afdc2d4bbb8 -SHA512 (linux-5.14-rc2-1-g8cae8cd89f05.tar.xz) = 974892a21f5ca8dfd64820dc7791ae15add8ba4dfa9c7974551ac694512435975975e26d5c85e5dc3ecbaf05a6b562639637ccd073163e4d99a0b6b8fac885da -SHA512 (kernel-abi-stablelists-5.14.0-0.rc2.20210721git8cae8cd89f05.24.tar.bz2) = e8128ee63b21e317b36a57f1c9f9a92efd3a6e5476b3fc0e3ba9b49023c32e24e4bf9581d71e203e955afc1fe16c7c411acfa377de9e1228ee502254d45a3b32 -SHA512 (kernel-kabi-dw-5.14.0-0.rc2.20210721git8cae8cd89f05.24.tar.bz2) = 91d65622db134adee50dde355cf91c2ee5bd62753a6f6c5d5ec853efa643580bf707dd0f5fa9fabbd26026ae970dbc9b8d3f34f9cfaf803700639107a34b5028 +SHA512 (linux-5.14-rc2-34-g3d5895cd3517.tar.xz) = 6c5c6da88605d0075dd330d6675c1c13a253733ae6824c79112b0c3e1ea1390b0e71fa69145aa03a1b8c5db6c2f5a7653b0428470e903d162c3cbdad53e09294 +SHA512 (kernel-abi-stablelists-5.14.0-0.rc2.20210722git3d5895cd3517.25.tar.bz2) = 81222edbbad8d5d827146fe632310429abe873e02de59ec38577b72a8c5e72bf58071fffa8cf78dec5cb37cbad6afd24e29c4afb1a59a244746c7f7bf2604cc0 +SHA512 (kernel-kabi-dw-5.14.0-0.rc2.20210722git3d5895cd3517.25.tar.bz2) = 1f1c62696c1af44f1bd4cce44f16f6dc6a27831a4e3fc89e276c4eac0fcb059ce8bbe532b5c7d38975d2d85e62f5f4418b8a32690506b55bcebd4f333b8cdc80