Skip to content

Commit 8b12594

Browse files
jinghao-jiaBenjamin Tissoires
authored andcommitted
samples/hid: fix broken vmlinux path for VMLINUX_BTF
Commit 13b2548 ("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: 13b2548 ("kbuild: change working directory to external module directory with M=") Tested-by: Ruowen Qin <[email protected]> Suggested-by: Daniel Borkmann <[email protected]> Suggested-by: Andrii Nakryiko <[email protected]> Signed-off-by: Jinghao Jia <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Benjamin Tissoires <[email protected]>
1 parent 1739caf commit 8b12594

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

samples/hid/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ $(obj)/hid_surface_dial.o: $(obj)/hid_surface_dial.skel.h
164164

165165
VMLINUX_BTF_PATHS ?= $(abspath $(if $(O),$(O)/vmlinux)) \
166166
$(abspath $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux)) \
167-
$(abspath ./vmlinux)
167+
$(abspath $(objtree)/vmlinux)
168168
VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS))))
169169

170170
$(obj)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL)

0 commit comments

Comments
 (0)