diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-03 17:07:51 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-03 17:07:51 +0200 |
| commit | 8dd1514bb2ecfb0a93531d83ed88316f6e84aafa (patch) | |
| tree | 66dcbb25a31df9541deb196b795e14cbca44a539 | |
| parent | 14782baa21df1206e1863374412a5c6e73284cab (diff) | |
| parent | 909e9e3e5b20530a3c9232740dfbb35146e6a547 (diff) | |
| download | kernel-8dd1514bb2ecfb0a93531d83ed88316f6e84aafa.tar.gz kernel-8dd1514bb2ecfb0a93531d83ed88316f6e84aafa.tar.xz kernel-8dd1514bb2ecfb0a93531d83ed88316f6e84aafa.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
| -rw-r--r-- | Makefile.rhelver | 2 | ||||
| -rwxr-xr-x | kernel.spec | 12 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 679b748aa..616f1636b 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 = 40 +RHEL_RELEASE = 41 # # ZSTREAM diff --git a/kernel.spec b/kernel.spec index 581ae8cfb..b6cd697f6 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -131,13 +131,13 @@ Summary: The Linux kernel %define rpmversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc5.40 +%define pkgrelease 0.rc5.20220503git9050ba3a61a4b5b.41 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.40%{?buildid}%{?dist} +%define specrelease 0.rc5.20220503git9050ba3a61a4b5b.41%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -692,7 +692,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.18-rc5.tar.xz +Source0: linux-5.18-rc5-6-g9050ba3a61a4b5b.tar.xz Source1: Makefile.rhelver @@ -1384,8 +1384,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc5 -c -mv linux-5.18-rc5 linux-%{KVERREL} +%setup -q -n kernel-5.18-rc5-6-g9050ba3a61a4b5b -c +mv linux-5.18-rc5-6-g9050ba3a61a4b5b linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -1,3 +1,3 @@ -SHA512 (linux-5.18-rc5.tar.xz) = 6a50216b57ed778cdf89ce3e2701c6ed27a8b0e41fb26836b4f97bb2be6363ece53f9691bdf95ed7978cbd609fa09ee115035d80dd7a1da369bb1dcfaf1d38a1 -SHA512 (kernel-abi-stablelists-5.18.0-0.rc5.40.tar.bz2) = cddb812f1967e9420f65cc6c05009cfa430e18f01c7853dc45893951eb24cb81d6ccac35d6d286f683398dcef66ec44b7e3a427605e3a5ffc6bd783f11479abd -SHA512 (kernel-kabi-dw-5.18.0-0.rc5.40.tar.bz2) = 7c11f85e21412a71343448d6763ddf8baf4635d4d50b2573cb2355ddf51e9406b25d94e294e56afbf982e7fd51b30d2ca05a675a038806846eb97d5ec51a0dd6 +SHA512 (linux-5.18-rc5-6-g9050ba3a61a4b5b.tar.xz) = bfcce539f8d12bc2727b78b5705388e78d0d8695afc4daf1517206528f4a102d6c21bd42c1b3e894f570cdd7fc7b4a713f15a455c3e5bdf2b5985de00640a6d6 +SHA512 (kernel-abi-stablelists-5.18.0-0.rc5.20220503git9050ba3a61a4b5b.41.tar.bz2) = e6537a63878c8d3d6143fc6903eee275f93990753e6c11fedef0955c0207accde6673beb9c4a66711a4328e5c7b6d2929aad31ecb3e8a4831698bcd83c66163e +SHA512 (kernel-kabi-dw-5.18.0-0.rc5.20220503git9050ba3a61a4b5b.41.tar.bz2) = 56e08ee1e7769b0ab5d72a4af399865365cad132cbbd1ccc8d15e2cfb19ca08d903f641b01ba96785830c1806b692998317964ce163f52cd256f844216c5439e |