| Message ID | 20250203085506.220297-1-jinghao7@illinois.edu (mailing list archive) |
|---|---|
| Headers | show |
| Series | Makefile fixes for samples/{bpf,hid} | expand |
On Mon, 03 Feb 2025 02:55:03 -0600, Jinghao Jia wrote: > Following commit 13b25489b6f8 ("kbuild: change working directory to > external module directory with M="), the Makefiles for both bpf and hid > samples are broken due to the use of the relative vmlinux path (i.e., > ./vmlinux) when generating vmlinux.h. Additionally, samples/hid experience > the same problem that was fixed for samples/bpf in commit 5a6ea7022ff4 > ("samples/bpf: Remove unnecessary -I flags from libbpf EXTRA_CFLAGS"). > > [...] Applied to hid/hid.git (for-6.14/upstream-fixes), thanks! [1/3] samples/hid: remove unnecessary -I flags from libbpf EXTRA_CFLAGS https://git.kernel.org/hid/hid/c/1739cafdb8de [3/3] samples/hid: fix broken vmlinux path for VMLINUX_BTF https://git.kernel.org/hid/hid/c/8b125949df58 Cheers,
Hi everyone, Following commit 13b25489b6f8 ("kbuild: change working directory to external module directory with M="), the Makefiles for both bpf and hid samples are broken due to the use of the relative vmlinux path (i.e., ./vmlinux) when generating vmlinux.h. Additionally, samples/hid experience the same problem that was fixed for samples/bpf in commit 5a6ea7022ff4 ("samples/bpf: Remove unnecessary -I flags from libbpf EXTRA_CFLAGS"). This patchset makes the following changes to fix these two problems: - The first patch applies the same fix from commit 5a6ea7022ff4 ("samples/bpf: Remove unnecessary -I flags from libbpf EXTRA_CFLAGS") to samples/hid. - The second and third patch replace the relative vmlinux paths in samples/{bpf,hid}/Makefile with $(objtree)/vmlinux to correctly refer to the vmlinux in kernel output directory, following the recent working directory change in kbuild. Changelog: v2 -> v3: - v2: https://lore.kernel.org/all/20250123081950.173588-1-jinghao7@illinois.edu/ - Address feedback from Andrii - Split the vmlinux path fixes for bpf and hid v1 -> v2: - v1: https://lore.kernel.org/all/20250120023027.160448-1-jinghao7@illinois.edu/ - Address feedback from Daniel - Apply vmlinux path fix to samples/hid - Add a second patch that fixes the include path issue in samples/hid, i.e., the same issue fixed fpr samples/bpf in commit 5a6ea7022ff4 ("samples/bpf: Remove unnecessary -I flags from libbpf EXTRA_CFLAGS") - Address feedback from Masahiro and Nicolas - Use $(objtree) instead of $(srctree) in the path when referring to vmlinux, as it is an artifact of kbuild Jinghao Jia (3): samples/hid: remove unnecessary -I flags from libbpf EXTRA_CFLAGS samples/bpf: fix broken vmlinux path for VMLINUX_BTF samples/hid: fix broken vmlinux path for VMLINUX_BTF samples/bpf/Makefile | 2 +- samples/hid/Makefile | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-)