Skip to content

spec: fix building and packaging of resolve_btfids

Commit 56a2df76 changed the resolve_btfids tool to be built as a host program. This causes selftests compilation error as we override HOSTCFLAGS when calling make from the specfile, effectively supressing the effect of HOSTCFLAGS update in tools/bpf/resolve_btfids/Makefile. See [1] for details why this happens.

This fixes the above error by passing HOSTCGLAGS and HOSTLDFLAGS through environment variables rather than through the make command.

In addition, since resolve_btfids is now compiled as a host program, it shouldn't be included in the kernel-devel package as its arch could not match the target arch. Instead, this just adds its source files to the package so that it is built when running make prepare.

[1] https://www.gnu.org/software/make/manual/html_node/Overriding.html

v2: do not change the way HOSTCFLAGS and HOSTLDFLAGS are passed from the specfile, instead fix resolve_btfids/Makefile to allow overriding HOSTCFLAGS (backported from bpf-next).

Signed-off-by: Viktor Malik vmalik@redhat.com

Edited by Viktor Malik

Merge request reports

Loading