| Message ID | 20250203085506.220297-3-jinghao7@illinois.edu |
|---|---|
| State | New |
| Headers | show |
| Series | Makefile fixes for samples/{bpf,hid} | expand |
On Mon, Feb 3, 2025 at 12:55 AM Jinghao Jia <jinghao7@illinois.edu> wrote: > > Commit 13b25489b6f8 ("kbuild: change working directory to external > module directory with M=") changed kbuild working directory of bpf > sample programs to samples/bpf, 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:316: *** Cannot find a vmlinux for VMLINUX_BTF at any of " /path/to/linux/samples/bpf/vmlinux", build the kernel or set VMLINUX_BTF like "VMLINUX_BTF=/sys/kernel/btf/vmlinux" 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> > Signed-off-by: Jinghao Jia <jinghao7@illinois.edu> > --- > samples/bpf/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Applied this patch to bpf-next. I presume HID ones will go through the respective tree. Thanks! > diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile > index dd9944a97b7e..5b632635e00d 100644 > --- a/samples/bpf/Makefile > +++ b/samples/bpf/Makefile > @@ -307,7 +307,7 @@ $(obj)/$(TRACE_HELPERS): TPROGS_CFLAGS := $(TPROGS_CFLAGS) -D__must_check= > > 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) > -- > 2.48.1 >
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index dd9944a97b7e..5b632635e00d 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -307,7 +307,7 @@ $(obj)/$(TRACE_HELPERS): TPROGS_CFLAGS := $(TPROGS_CFLAGS) -D__must_check= 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)
Commit 13b25489b6f8 ("kbuild: change working directory to external module directory with M=") changed kbuild working directory of bpf sample programs to samples/bpf, 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:316: *** Cannot find a vmlinux for VMLINUX_BTF at any of " /path/to/linux/samples/bpf/vmlinux", build the kernel or set VMLINUX_BTF like "VMLINUX_BTF=/sys/kernel/btf/vmlinux" 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> Signed-off-by: Jinghao Jia <jinghao7@illinois.edu> --- samples/bpf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)