Skip to content

Commit 89d024a

Browse files
author
Benjamin Tissoires
committed
selftests/hid: do not manually call headers_install
"make headers" is a requirement before calling make on the selftests dir, so we should not have to manually install those headers Acked-by: Shuah Khan <[email protected]> Tested-by: Nick Desaulniers <[email protected]> # Build Tested-by: Justin Stitt <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Benjamin Tissoires <[email protected]>
1 parent ae7487d commit 89d024a

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

tools/testing/selftests/hid/Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CXX ?= $(CROSS_COMPILE)g++
2121

2222
HOSTPKG_CONFIG := pkg-config
2323

24-
CFLAGS += -g -O0 -rdynamic -Wall -Werror -I$(KHDR_INCLUDES) -I$(OUTPUT)
24+
CFLAGS += -g -O0 -rdynamic -Wall -Werror -I$(OUTPUT)
2525
LDLIBS += -lelf -lz -lrt -lpthread
2626

2727
# Silence some warnings when compiled with clang
@@ -65,7 +65,6 @@ BPFTOOLDIR := $(TOOLSDIR)/bpf/bpftool
6565
SCRATCH_DIR := $(OUTPUT)/tools
6666
BUILD_DIR := $(SCRATCH_DIR)/build
6767
INCLUDE_DIR := $(SCRATCH_DIR)/include
68-
KHDR_INCLUDES := $(SCRATCH_DIR)/uapi/include
6968
BPFOBJ := $(BUILD_DIR)/libbpf/libbpf.a
7069
ifneq ($(CROSS_COMPILE),)
7170
HOST_BUILD_DIR := $(BUILD_DIR)/host
@@ -151,9 +150,6 @@ else
151150
$(Q)cp "$(VMLINUX_H)" $@
152151
endif
153152

154-
$(KHDR_INCLUDES)/linux/hid.h: $(top_srcdir)/include/uapi/linux/hid.h
155-
$(MAKE) -C $(top_srcdir) INSTALL_HDR_PATH=$(SCRATCH_DIR)/uapi headers_install
156-
157153
$(RESOLVE_BTFIDS): $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/resolve_btfids \
158154
$(TOOLSDIR)/bpf/resolve_btfids/main.c \
159155
$(TOOLSDIR)/lib/rbtree.c \
@@ -231,7 +227,7 @@ $(BPF_SKELS): %.skel.h: %.bpf.o $(BPFTOOL) | $(OUTPUT)
231227
$(Q)$(BPFTOOL) gen object $(<:.o=.linked1.o) $<
232228
$(Q)$(BPFTOOL) gen skeleton $(<:.o=.linked1.o) name $(notdir $(<:.bpf.o=)) > $@
233229

234-
$(OUTPUT)/%.o: %.c $(BPF_SKELS) $(KHDR_INCLUDES)/linux/hid.h
230+
$(OUTPUT)/%.o: %.c $(BPF_SKELS)
235231
$(call msg,CC,,$@)
236232
$(Q)$(CC) $(CFLAGS) -c $(filter %.c,$^) $(LDLIBS) -o $@
237233

0 commit comments

Comments
 (0)