summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorJinghao Jia <jinghao7@illinois.edu>2025-02-03 02:55:06 -0600
committerBenjamin Tissoires <bentiss@kernel.org>2025-02-04 11:07:41 +0100
commit8b125949df58a00e8797c6e6d3f3d3dc08f4d939 (patch)
tree721d88504bb19ff736240b560ac6e07284e067e0 /samples
parent1739cafdb8decad538410b05a4640055408826de (diff)
samples/hid: fix broken vmlinux path for VMLINUX_BTF
Commit 13b25489b6f8 ("kbuild: change working directory to external module directory with M=") changed kbuild working directory of hid-bpf sample programs to samples/hid, which broke the vmlinux path for VMLINUX_BTF, as the Makefiles assume the current work directory to be the kernel output directory and use a relative path (i.e., ./vmlinux): Makefile:173: *** Cannot find a vmlinux for VMLINUX_BTF at any of " /path/to/linux/samples/hid/vmlinux", build the kernel or set VMLINUX_BTF or VMLINUX_H variable. Stop. Correctly refer to the kernel output directory using $(objtree). Fixes: 13b25489b6f8 ("kbuild: change working directory to external module directory with M=") Tested-by: Ruowen Qin <ruqin@redhat.com> Suggested-by: Daniel Borkmann <daniel@iogearbox.net> Suggested-by: Andrii Nakryiko <andrii@kernel.org> Signed-off-by: Jinghao Jia <jinghao7@illinois.edu> Link: https://patch.msgid.link/20250203085506.220297-4-jinghao7@illinois.edu Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
Diffstat (limited to 'samples')
-rw-r--r--samples/hid/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/hid/Makefile b/samples/hid/Makefile
index 69159c81d045..db5a077c77fc 100644
--- a/samples/hid/Makefile
+++ b/samples/hid/Makefile
@@ -164,7 +164,7 @@ $(obj)/hid_surface_dial.o: $(obj)/hid_surface_dial.skel.h
VMLINUX_BTF_PATHS ?= $(abspath $(if $(O),$(O)/vmlinux)) \
$(abspath $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux)) \
- $(abspath ./vmlinux)
+ $(abspath $(objtree)/vmlinux)
VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS))))
$(obj)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL)