Re: [PATCH v5 3/4] selftests/hid: build the BPF program via the shared lib.bpf.mk
From: bot+bpf-ci@kernel.org
Date: 2026-09-11 07:44:52
Also in:
bpf, cgroups, linux-kselftest, linux-mm, lkml, llvm, sched-ext
quoted hunk ↗ jump to hunk
diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests/hid/Makefile index 2f423de83147..1190a747036d 100644 --- a/tools/testing/selftests/hid/Makefile +++ b/tools/testing/selftests/hid/Makefile@@ -47,7 +47,6 @@ msg = else msg = @printf ' %-8s%s %s%s\n' "$(1)" "$(if $(2), [$(2)])" "$(notdir $(3))" "$(if $(4), $(4))"; MAKEFLAGS += --no-print-directory -submake_extras := feature_display=0 endif
This isn't a bug, but with submake_extras gone, does anything still need this local msg/MAKEFLAGS block? lib.mk defines both identically a few lines below, so it looks like it could be dropped along with the rest of the copied machinery.
quoted hunk ↗ jump to hunk
@@ -58,172 +57,25 @@ override define CLEAN $(Q)$(RM) -r $(EXTRA_CLEAN) endef -include ../lib.mk - -TOOLSDIR := $(top_srcdir)/tools -LIBDIR := $(TOOLSDIR)/lib -BPFDIR := $(LIBDIR)/bpf -TOOLSINCDIR := $(TOOLSDIR)/include -BPFTOOLDIR := $(TOOLSDIR)/bpf/bpftool -SCRATCH_DIR := $(OUTPUT)/tools -BUILD_DIR := $(SCRATCH_DIR)/build -INCLUDE_DIR := $(SCRATCH_DIR)/include -BPFOBJ := $(BUILD_DIR)/libbpf/libbpf.a
[ ... ]
+# Build the legacy progs/*.c layout with the shared BPF rules. +BPF_SRCS := $(wildcard progs/*.c) +BPF_PROG_EXT := .c +# BPFDIR is defined when this recursive variable is expanded. +BPF_EXTRA_HDRS = $(wildcard progs/*.h) $(wildcard $(BPFDIR)/hid_bpf_*.h) \ + $(wildcard $(BPFDIR)/*.bpf.h) +
This isn't a bug, but do the two $(BPFDIR) wildcards still match anything here? tools/lib/bpf has no hid_bpf_*.h, and lib.bpf.mk's lib_bpf_header_sources already covers *.bpf.h - if so, this could become a simple BPF_EXTRA_HDRS := $(wildcard progs/*.h) and lose the recursive-expansion comment. --- AI reviewed your patch. Please fix the bug or email reply why it's not a bug. See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.md CI run summary: https://github.com/kernel-patches/bpf/actions/runs/34573210499