diff --git a/kernel.spec b/kernel.spec index a53a68d4c..62bc71719 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2463,7 +2463,7 @@ InitBuildVars() { BuildBpftool(){ export BPFBOOTSTRAP_CFLAGS=$(echo "%{__global_compiler_flags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//") export BPFBOOTSTRAP_LDFLAGS=$(echo "%{__global_ldflags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//") - CFLAGS="" LDFLAGS="" make EXTRA_CFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_CXXFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_LDFLAGS="${BPFBOOTSTRAP_LDFLAGS}" %{?make_opts} %{?clang_make_opts} V=1 -C tools/bpf/bpftool bootstrap + CFLAGS="" LDFLAGS="" make HOST_EXTRACFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_CFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_CXXFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_LDFLAGS="${BPFBOOTSTRAP_LDFLAGS}" %{?make_opts} %{?clang_make_opts} V=1 -C tools/bpf/bpftool bootstrap } # Main function to compile and install a kernel variant @@ -3355,7 +3355,7 @@ fi %global perf_build_extra_ldflags -Wl,-z,notext %endif %global perf_make \ - %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags} -Wl,-E %{?perf_build_extra_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} + %{__make} %{?make_opts} HOST_EXTRACFLAGS="${RPM_OPT_FLAGS}" EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags} -Wl,-E %{?perf_build_extra_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} %{log_msg "Build perf"} # perf @@ -4857,6 +4857,9 @@ fi\ # # %changelog +* Mon Jun 22 2026 Justin M. Forbes [7.2.0-0.rc0.260622gef0c9f75a195.6] +- redhat/kernel.spec: set also HOST_EXTRACFLAGS for BPF bootstrap build (Jan Stancek) + * Mon Jun 22 2026 Fedora Kernel Team [7.2.0-0.rc0.ef0c9f75a195.6] - automotive: enable HUGETLBFS to workaround build error (Scott Weaver) diff --git a/sources b/sources index 450ca3f42..feee4d65a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-7.1-11336-gef0c9f75a195.tar.xz) = 0fe0b43603532ba1529e076cc7af3ea290ef87b95c1e85e578405eda42bbb59d0f4161c1f98a2092e81f8a98e0f5dc50bb704c0340a0494f33c1b68ae629ddc3 -SHA512 (kernel-abi-stablelists-7.2.0.tar.xz) = 6a4be21b58d4bba437555cca10778b55efba8decb9cf20c87420a19e9d6c5b3b3114fea3809bb77c7966a6d773a884860e1654dd7678427be3978523515b345c +SHA512 (kernel-abi-stablelists-7.2.0.tar.xz) = 2c2dc25635d7e18107fceed0d332f94cec06fca69a24c631926787e85459c3bda8bafb33867668c6dd503dce56848047f858453981450b46fc4541dea7dfd1f0 SHA512 (kernel-kabi-dw-7.2.0.tar.xz) = a256804dcdfe01de0dde101cde8834c9756654522cf9eeffd42403c59c042ab09e516ae95c4eed935c6d18cc1e327bd774655d013de3e46f58d27817d2eaea23