diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-13 15:27:54 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-13 15:27:54 +0200 |
| commit | 2304da9ee45358edb411bee5f403eed710a8c05f (patch) | |
| tree | 761534805e59a286e6623f331386b62616df8f44 /kernel.spec | |
| parent | 59eafecd9c6215ab045765709262614f55b6a74b (diff) | |
| parent | 604fe9e0e35e0aeda79a51b9f2d39dbcc101630d (diff) | |
| download | kernel-2304da9ee45358edb411bee5f403eed710a8c05f.tar.gz kernel-2304da9ee45358edb411bee5f403eed710a8c05f.tar.xz kernel-2304da9ee45358edb411bee5f403eed710a8c05f.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec index 7672c39b3..e26abaf08 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,9 +85,9 @@ 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 -%global distro_build 0.rc2.23 +%global distro_build 0.rc2.20220413gita19944809fe9942.23 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -134,13 +134,13 @@ Summary: The Linux kernel %define rpmversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc2.23 +%define pkgrelease 0.rc2.20220413gita19944809fe9942.23 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.23%{?buildid}%{?dist} +%define specrelease 0.rc2.20220413gita19944809fe9942.23%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -700,7 +700,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.18-rc2.tar.xz +Source0: linux-5.18-rc2-50-ga19944809fe9942.tar.xz Source1: Makefile.rhelver @@ -1392,8 +1392,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc2 -c -mv linux-5.18-rc2 linux-%{KVERREL} +%setup -q -n kernel-5.18-rc2-50-ga19944809fe9942 -c +mv linux-5.18-rc2-50-ga19944809fe9942 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2255,7 +2255,7 @@ chmod +x tools/power/cpupower/utils/version-gen.sh %{make} CFLAGS+="-D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" popd pushd tools/arch/x86/intel_sdsi - %{make} + %{tools_make} popd %endif %endif @@ -3031,7 +3031,10 @@ fi # # %changelog -* Mon Apr 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc2.22] +* Wed Apr 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc2.a19944809fe9942.22] +- redhat/configs: enable CONFIG_SAMPLE_VFIO_MDEV_MTTY (Patrick Talbert) +- Build intel_sdsi with %%{tools_make} (Justin M. Forbes) +- configs: remove redundant Fedora config for INTEL_IDXD_COMPAT (Jerry Snitselaar) - tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed (Herton R. Krzesinski) * Mon Apr 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc2.21] |