diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-24 17:34:23 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-24 17:34:23 +0100 |
commit | 509a64bffdcf915a9903c30fe053843b143b3b43 (patch) | |
tree | ac9e71d29fd01c9b7e46b4ea038bbfa08dec85f3 /kernel.spec | |
parent | 60de648e16d6b519379d3949aa28318f9684ccd9 (diff) | |
parent | f55c3e9ed8605ff28cb9a922efbab1055947e213 (diff) | |
download | kernel-509a64bffdcf915a9903c30fe053843b143b3b43.tar.gz kernel-509a64bffdcf915a9903c30fe053843b143b3b43.tar.xz kernel-509a64bffdcf915a9903c30fe053843b143b3b43.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc1.20220124gitdd81e1c7d5fb.76.vanilla.1.fc36kernel-5.17.0-0.rc1.20220124gitdd81e1c7d5fb.76.vanilla.1.fc35kernel-5.17.0-0.rc1.20220124gitdd81e1c7d5fb.76.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/kernel.spec b/kernel.spec index 49e88caeb..1e3dde879 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc0.20220121gitc2c94b3b187d.73 +%global distro_build 0.rc1.20220124gitdd81e1c7d5fb.76 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -134,13 +134,13 @@ Summary: The Linux kernel %define rpmversion 5.17.0 %define patchversion 5.17 -%define pkgrelease 0.rc0.20220121gitc2c94b3b187d.73 +%define pkgrelease 0.rc1.20220124gitdd81e1c7d5fb.76 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20220121gitc2c94b3b187d.73%{?buildid}%{?dist} +%define specrelease 0.rc1.20220124gitdd81e1c7d5fb.76%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -694,7 +694,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-11444-gc2c94b3b187d.tar.xz +Source0: linux-5.17-rc1-32-gdd81e1c7d5fb.tar.xz Source1: Makefile.rhelver @@ -814,7 +814,6 @@ Source80: generate_all_configs.sh Source81: process_configs.sh Source82: update_scripts.sh -Source83: generate_crashkernel_default.sh Source84: mod-internal.list @@ -882,7 +881,8 @@ Provides: kernel-drm-nouveau = 16\ Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires(pre): %{kernel_prereq}\ Requires(pre): %{initrd_prereq}\ -Requires(pre): linux-firmware >= 20150904-56.git6ebf5d57\ +Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\ +Recommends: linux-firmware\ Requires(preun): systemd >= 200\ Conflicts: xfsprogs < 4.3.0-1\ Conflicts: xorg-x11-drv-vmmouse < 13.0.99\ @@ -1388,8 +1388,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-11444-gc2c94b3b187d -c -mv linux-5.16-11444-gc2c94b3b187d linux-%{KVERREL} +%setup -q -n kernel-5.17-rc1-32-gdd81e1c7d5fb -c +mv linux-5.17-rc1-32-gdd81e1c7d5fb linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2126,9 +2126,6 @@ BuildKernel() { # prune junk from kernel-devel find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -delete - # Generate crashkernel default config - %{SOURCE83} "$KernelVer" "$Arch" "$RPM_BUILD_ROOT" - # Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer %ifarch x86_64 aarch64 @@ -2935,7 +2932,6 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/source\ /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\ /lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\ -/lib/modules/%{KVERREL}%{?3:+%{3}}/crashkernel.default\ /lib/modules/%{KVERREL}%{?3:+%{3}}/systemtap\ %{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\ %if %{1}\ @@ -2992,9 +2988,15 @@ fi # # %changelog -* Fri Jan 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220121gitc2c94b3b187d.73] +* Mon Jan 24 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc1.20220124gitdd81e1c7d5fb.76] - objtool: check: give big enough buffer for pv_ops (Sergei Trofimovich) +* Sat Jan 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220122git1c52283265a4.73] +- Revert "[redhat] Generate a crashkernel.default for each kernel build" (Coiby Xu) +- spec: make linux-firmware weak(er) dependency (Jan Stancek) +- rtw89: enable new driver rtw89 and device RTK8852AE (Íñigo Huguet) +- Config consolidation into common (Justin M. Forbes) + * Thu Jan 20 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220120gitfa2e1ba3e9e3.71] - Fixup merge in random.c (Justin M. Forbes) |