From 2b9339aa81ff4d7e536f4f45f2eff3618d73d1af Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 22 Nov 2021 09:23:03 -0600 Subject: kernel-5.16-0.rc1.20211120gita90af8f15bdc.17 * Sat Nov 20 2021 Fedora Kernel Team [5.16-0.rc1.20211120gita90af8f15bdc.17] - spec: add bpf_testmod.ko to kselftests/bpf (Viktor Malik) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index 51a3f4bc5..2c2c5d04b 100755 --- a/kernel.spec +++ b/kernel.spec @@ -83,9 +83,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 0 +%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 @@ -130,13 +130,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} @@ -682,7 +682,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 @@ -1374,8 +1374,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} . @@ -2270,7 +2270,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 @@ -2972,8 +2972,8 @@ fi # # %changelog -* Fri Nov 19 2021 Fedora Kernel Team [5.16-0.rc1.20211119git4c388a8e740d.17] -- kasan: test: Silence intentional read overflow warnings (Kees Cook) +* Sat Nov 20 2021 Fedora Kernel Team [5.16-0.rc1.20211120gita90af8f15bdc.17] +- spec: add bpf_testmod.ko to kselftests/bpf (Viktor Malik) * Thu Nov 18 2021 Fedora Kernel Team [5.16-0.rc1.20211118git42eb8fdac2fc.15] - New configs in drivers/net/wwan (Fedora Kernel Team) -- cgit From c329a372ecd9e18822a1ccc805e9275252fbbed2 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 22 Nov 2021 10:15:32 -0600 Subject: Turn off dynamic libbpf for eln Signed-off-by: Justin M. Forbes --- kernel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index 2c2c5d04b..4701822fd 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2184,7 +2184,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 -- cgit