Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile fixes for samples/{bpf,hid} #4908

Open
wants to merge 2 commits into
base: bpf_base
Choose a base branch
from

Conversation

kernel-patches-daemon-bpf-rc[bot]
Copy link

Pull request for series with
subject: Makefile fixes for samples/{bpf,hid}
version: 2
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=927735

@kernel-patches-daemon-bpf-rc
Copy link
Author

Upstream branch: d0d106a
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=927735
version: 2

@kernel-patches-daemon-bpf-rc
Copy link
Author

Upstream branch: 7569fc9
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=927735
version: 2

Commit 5a6ea70 ("samples/bpf: Remove unnecessary -I flags from
libbpf EXTRA_CFLAGS") fixed the build error caused by redundant include
path for samples/bpf, but not samples/hid.

Apply the same fix on samples/hid as well.

Fixes: 13b2548 ("kbuild: change working directory to external module directory with M=")
Tested-by: Ruowen Qin <[email protected]>
Signed-off-by: Jinghao Jia <[email protected]>
Commit 13b2548 ("kbuild: change working directory to external
module directory with M=") changed kbuild working directory of bpf and
hid samples to samples/{bpf,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: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: 13b2548 ("kbuild: change working directory to external module directory with M=")
Tested-by: Ruowen Qin <[email protected]>
Signed-off-by: Jinghao Jia <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant