Commit d7db0a4e authored by Quentin Monnet's avatar Quentin Monnet Committed by Andrii Nakryiko
Browse files

bpftool: Add install-bin target to install binary only 



With "make install", bpftool installs its binary and its bash completion
file. Usually, this is what we want. But a few components in the kernel
repository (namely, BPF iterators and selftests) also install bpftool
locally before using it. In such a case, bash completion is not
necessary and is just a useless build artifact.

Let's add an "install-bin" target to bpftool, to offer a way to install
the binary only.

Signed-off-by: default avatarQuentin Monnet <quentin@isovalent.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211007194438.34443-13-quentin@isovalent.com
parent 87ee33bf

kernel/bpf/preload/iterators/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -66,4 +66,4 @@ $(DEFAULT_BPFTOOL): $(BPFOBJ) | $(BPFTOOL_OUTPUT) 
		    OUTPUT=$(BPFTOOL_OUTPUT)/				       \

		    LIBBPF_OUTPUT=$(LIBBPF_OUTPUT)/			       \

		    LIBBPF_DESTDIR=$(LIBBPF_DESTDIR)/			       \

		    prefix= DESTDIR=$(abs_out)/ install
 
		    prefix= DESTDIR=$(abs_out)/ install-bin

tools/bpf/bpftool/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -226,10 +226,12 @@ clean: $(LIBBPF)-clean $(LIBBPF_BOOTSTRAP)-clean feature-detect-clean 
	$(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.bpftool

	$(Q)$(RM) -r -- $(OUTPUT)feature/



install: $(OUTPUT)bpftool

install-bin: $(OUTPUT)bpftool

	$(call QUIET_INSTALL, bpftool)

	$(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(prefix)/sbin

	$(Q)$(INSTALL) $(OUTPUT)bpftool $(DESTDIR)$(prefix)/sbin/bpftool



install: install-bin

	$(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(bash_compdir)

	$(Q)$(INSTALL) -m 0644 bash-completion/bpftool $(DESTDIR)$(bash_compdir)
@@ -256,6 +258,6 @@ zdep: 
	@if [ "$(feature-zlib)" != "1" ]; then echo "No zlib found"; exit 1 ; fi



.SECONDARY:

.PHONY: all FORCE clean install uninstall zdep

.PHONY: all FORCE clean install-bin install uninstall zdep

.PHONY: doc doc-clean doc-install doc-uninstall

.DEFAULT_GOAL := all

tools/testing/selftests/bpf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \ 
		    OUTPUT=$(HOST_BUILD_DIR)/bpftool/			       \

		    LIBBPF_OUTPUT=$(HOST_BUILD_DIR)/libbpf/		       \

		    LIBBPF_DESTDIR=$(HOST_SCRATCH_DIR)/			       \

		    prefix= DESTDIR=$(HOST_SCRATCH_DIR)/ install

		    prefix= DESTDIR=$(HOST_SCRATCH_DIR)/ install-bin



all: docs