diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-09 18:06:56 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-09 18:06:56 +0200 |
| commit | 244320bc270fa1f292db7c044269c96cd3a532f0 (patch) | |
| tree | d2c13a771c0f9981ab08b2930afe6fb9557c7b06 /kernel.spec | |
| parent | 908c0813b908d373170a1163fe20392f2b121d2c (diff) | |
| parent | 7ef390b6c4b96503cbea4a54f5caff0e84dbb9aa (diff) | |
| download | kernel-244320bc270fa1f292db7c044269c96cd3a532f0.tar.gz kernel-244320bc270fa1f292db7c044269c96cd3a532f0.tar.xz kernel-244320bc270fa1f292db7c044269c96cd3a532f0.zip | |
merge originkernel-5.18.0-0.rc6.47.vanilla.1.fc37kernel-5.18.0-0.rc6.47.vanilla.1.fc36kernel-5.18.0-0.rc6.47.vanilla.1.fc35kernel-5.18.0-0.rc6.47.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec index 400a1c2c7..4ccd3d246 100755 --- a/kernel.spec +++ b/kernel.spec @@ -131,13 +131,13 @@ Summary: The Linux kernel %define specversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc5.20220506gitfe27d189e3f42e3.44 +%define pkgrelease 0.rc6.47 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.220506.fe27d189e3f42e3.44%{?buildid}%{?dist} +%define specrelease 0.rc6.47%{?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-115-gfe27d189e3f42e3.tar.xz +Source0: linux-5.18-rc6.tar.xz Source1: Makefile.rhelver @@ -1384,8 +1384,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc5-115-gfe27d189e3f42e3 -c -mv linux-5.18-rc5-115-gfe27d189e3f42e3 linux-%{KVERREL} +%setup -q -n kernel-5.18-rc6 -c +mv linux-5.18-rc6 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3031,6 +3031,10 @@ fi # # %changelog +* Mon May 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.46] +- redhat/self-test: Add test to verify Makefile declarations. (Prarit Bhargava) +- redhat/Makefile: Add RHTEST (Prarit Bhargava) + * Fri May 06 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc5.fe27d189e3f42e3.43] - redhat: shellcheck cleanup (Prarit Bhargava) - redhat/self-test/data: Cleanup data (Prarit Bhargava) |