diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-25 20:19:58 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-25 20:19:58 +0200 |
commit | 27a1f3ac339654a74d06323a6949a3313188434d (patch) | |
tree | 258aa57d7c1c13455e262bb79e6aa9ea1c3e6756 /kernel.spec | |
parent | f94a7b966a71a5fa3d1d1d379bd41e4889aaa7d7 (diff) | |
parent | fda510074f60be8da2cac714034788ec6700ae0d (diff) | |
download | kernel-27a1f3ac339654a74d06323a6949a3313188434d.tar.gz kernel-27a1f3ac339654a74d06323a6949a3313188434d.tar.xz kernel-27a1f3ac339654a74d06323a6949a3313188434d.zip |
merge originkernel-5.18.0-0.rc4.33.vanilla.1.fc37kernel-5.18.0-0.rc4.33.vanilla.1.fc36kernel-5.18.0-0.rc4.33.vanilla.1.fc35kernel-5.18.0-0.rc4.33.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 52a1d4e4e..34e2c08c1 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.rc3.20220422gitd569e86915b7f2f.31 +%global distro_build 0.rc4.33 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -133,13 +133,13 @@ Summary: The Linux kernel %define rpmversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc3.20220422gitd569e86915b7f2f.31 +%define pkgrelease 0.rc4.33 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.220422.d569e86915b7f2f.31%{?buildid}%{?dist} +%define specrelease 0.rc4.33%{?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.18-rc3-80-gd569e86915b7f2f.tar.xz +Source0: linux-5.18-rc4.tar.xz Source1: Makefile.rhelver @@ -1386,8 +1386,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc3-80-gd569e86915b7f2f -c -mv linux-5.18-rc3-80-gd569e86915b7f2f linux-%{KVERREL} +%setup -q -n kernel-5.18-rc4 -c +mv linux-5.18-rc4 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3033,7 +3033,7 @@ fi # # %changelog -* Fri Apr 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc3.d569e86915b7f2f.30] +* Sat Apr 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc3.c00c5e1d157bec0.30] - redhat/self-test: Clean up data set (Prarit Bhargava) - redhat/Makefile.rhpkg: Remove quotes for RHDISTGIT (Prarit Bhargava) - redhat/scripts/create-tarball.sh: Use Makefile variables (Prarit Bhargava) @@ -3045,6 +3045,7 @@ fi - redhat/configs/process_configs.sh: Use Makefile variables (Prarit Bhargava) - redhat/kernel.spec.template: Use RPM_BUILD_NCPUS (Prarit Bhargava) - redhat/configs/generate_all_configs.sh: Use Makefile variables (Prarit Bhargava) +- redhat/configs: enable nf_tables SYNPROXY extension on ark (Davide Caratti) * Fri Apr 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc3.d569e86915b7f2f.29] - fedora: Disable fbdev drivers missed before (Javier Martinez Canillas) |