diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-17 12:10:30 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-17 12:10:30 +0200 |
commit | cdae211d92d55310ec7867be6ee96fa9723309b9 (patch) | |
tree | aff11eb2d4e0f6f4bd62e6d6c0f39fc325130b03 /kernel.spec | |
parent | 001073459e1a0f639ccc4d3fd4cd9de3953afc00 (diff) | |
parent | ea072671a1ed7495ca3777a2a1df5f2ff50b6d2b (diff) | |
download | kernel-cdae211d92d55310ec7867be6ee96fa9723309b9.tar.gz kernel-cdae211d92d55310ec7867be6ee96fa9723309b9.tar.xz kernel-cdae211d92d55310ec7867be6ee96fa9723309b9.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc6.46.vanilla.1.fc36kernel-5.14.0-0.rc6.46.vanilla.1.fc35kernel-5.14.0-0.rc6.46.vanilla.1.fc34kernel-5.14.0-0.rc6.46.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec index 2bb49349d..9e76322e3 100755 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc5.20210813gitf8e6dfc64f61.46 +%global distro_build 0.rc6.46 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -126,13 +126,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 0.rc5.20210813gitf8e6dfc64f61.46 +%define pkgrelease 0.rc6.46 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20210813gitf8e6dfc64f61.46%{?buildid}%{?dist} +%define specrelease 0.rc6.46%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -673,7 +673,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14-rc5-184-gf8e6dfc64f61.tar.xz +Source0: linux-5.14-rc6.tar.xz Source1: Makefile.rhelver @@ -1359,8 +1359,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-rc5-184-gf8e6dfc64f61 -c -mv linux-5.14-rc5-184-gf8e6dfc64f61 linux-%{KVERREL} +%setup -q -n kernel-5.14-rc6 -c +mv linux-5.14-rc6 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2653,7 +2653,7 @@ then\ %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ fi\ %endif\ -/bin/kernel-install -v add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ +/bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ %{nil} # @@ -2958,9 +2958,6 @@ fi # # %changelog -* Fri Aug 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc5.20210813gitf8e6dfc64f61.46] -- pinctrl: tigerlake: Fix GPIO mapping for newer version of software (Andy Shevchenko) - * Fri Aug 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc5.20210813gitf8e6dfc64f61.45] - update filters for Fedora (Justin M. Forbes) |