diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-22 18:05:26 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-22 18:05:26 +0100 |
commit | 121dabf2a653b60b703e4c706711ea13cfd51f85 (patch) | |
tree | 9f2eba34fdad8004d69dda4b523e4c325d264d98 /kernel.spec | |
parent | 59e52db8a2349e1f1b64e50790dc3bb6afe08ec7 (diff) | |
parent | c329a372ecd9e18822a1ccc805e9275252fbbed2 (diff) | |
download | kernel-121dabf2a653b60b703e4c706711ea13cfd51f85.tar.gz kernel-121dabf2a653b60b703e4c706711ea13cfd51f85.tar.xz kernel-121dabf2a653b60b703e4c706711ea13cfd51f85.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc2.18.vanilla.1.fc36kernel-5.16.0-0.rc2.18.vanilla.1.fc35kernel-5.16.0-0.rc2.18.vanilla.1.fc34kernel-5.16.0-0.rc2.18.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec index f850c3497..00e84a845 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc1.20211119git4c388a8e740d.17 +%global distro_build 0.rc2.18 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc1.20211119git4c388a8e740d.17 +%define pkgrelease 0.rc2.18 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20211119git4c388a8e740d.17%{?buildid}%{?dist} +%define specrelease 0.rc2.18%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -684,7 +684,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-rc1-236-g4c388a8e740d.tar.xz +Source0: linux-5.16-rc2.tar.xz Source1: Makefile.rhelver @@ -1376,8 +1376,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-rc1-236-g4c388a8e740d -c -mv linux-5.16-rc1-236-g4c388a8e740d linux-%{KVERREL} +%setup -q -n kernel-5.16-rc2 -c +mv linux-5.16-rc2 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2190,7 +2190,7 @@ InitBuildVars %global perf_build_extra_opts CORESIGHT=1 %endif %global perf_make \ - %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} + %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} # perf # make sure check-headers.sh is executable @@ -2276,7 +2276,7 @@ for dir in bpf bpf/no_alu32 bpf/progs; do test -d $dir || continue mkdir -p %{buildroot}%{_libexecdir}/kselftests/$dir find $dir -maxdepth 1 -type f \( -executable -o -name '*.py' -o -name settings -o \ - -name 'btf_dump_test_case_*.c' -o \ + -name 'btf_dump_test_case_*.c' -o -name '*.ko' -o \ -name '*.o' -exec sh -c 'readelf -h "{}" | grep -q "^ Machine:.*BPF"' \; \) -print0 | \ xargs -0 cp -t %{buildroot}%{_libexecdir}/kselftests/$dir || true done @@ -2978,8 +2978,8 @@ fi # # %changelog -* Fri Nov 19 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc1.20211119git4c388a8e740d.17] -- kasan: test: Silence intentional read overflow warnings (Kees Cook) +* Sat Nov 20 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc1.20211120gita90af8f15bdc.17] +- spec: add bpf_testmod.ko to kselftests/bpf (Viktor Malik) * Thu Nov 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc1.20211118git42eb8fdac2fc.15] - New configs in drivers/net/wwan (Fedora Kernel Team) |