Commit 37db10bc authored Oct 25, 2023 by Viktor Malik Committed by Daniel Borkmann Oct 26, 2023

samples/bpf: Allow building with custom bpftool

samples/bpf build its own bpftool boostrap to generate vmlinux.h as well
as some BPF objects. This is a redundant step if bpftool has been
already built, so update samples/bpf/Makefile such that it accepts a
path to bpftool passed via the BPFTOOL variable. The approach is
practically the same as tools/testing/selftests/bpf/Makefile uses.

Signed-off-by: Viktor Malik <vmalik@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/bd746954ac271b02468d8d951ff9f11e655d485b.1698213811.git.vmalik@redhat.com

parent f56bcfad

samples/bpf/Makefile

+3 −2

Original line number	Diff line number	Diff line
		@@ -260,8 +260,9 @@ $(LIBBPF): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) \| $(LIBBPF_OU

		BPFTOOLDIR := $(TOOLS_PATH)/bpf/bpftool
		BPFTOOL_OUTPUT := $(abspath $(BPF_SAMPLES_PATH))/bpftool
		BPFTOOL := $(BPFTOOL_OUTPUT)/bootstrap/bpftool
		$(BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \| $(BPFTOOL_OUTPUT)
		DEFAULT_BPFTOOL := $(BPFTOOL_OUTPUT)/bootstrap/bpftool
		BPFTOOL ?= $(DEFAULT_BPFTOOL)
		$(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \| $(BPFTOOL_OUTPUT)
		$(MAKE) -C $(BPFTOOLDIR) srctree=$(BPF_SAMPLES_PATH)/../../ \
		OUTPUT=$(BPFTOOL_OUTPUT)/ bootstrap