From patchwork Thu Oct 5 15:55:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 13410222 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5D3730F93 for ; Thu, 5 Oct 2023 15:55:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HnUuOuzj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47217C433C9; Thu, 5 Oct 2023 15:55:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696521359; bh=kepJfzWT2D89KAm/FDIV534BRNofr3W/Lz1wk8g0krs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=HnUuOuzjNB341ryqf37ET9waEJFD4OEbRSkt58uo71aNC1WoiXy7is9q72cbwS5Tz SZ50W1L08BUJ/edZCoLF4UOwRx5Zt4xWotbQFJLxP1OGqC4JarwYi55Masjfbefb9S GFifXWrWEAbpbck2iBnj+P8lemYql/QHhfmW+e6kbdexb7e+kIYqssod9ufTTTyYgB fPPQ5loVxqlSCW+B90qS4C4AloshshD19pkhMoAfXCSK8WeerCkE7xC4EIXInN5Go/ V56k38HZ4JkB8TiRhS4DB8U7Qv2yeM1FSksk3hrmKnU/OFivm3JN/b4E9BKV+HXrgI 9YU2jeRNrTCTw== From: Benjamin Tissoires Date: Thu, 05 Oct 2023 17:55:33 +0200 Subject: [PATCH v3 2/3] selftests/hid: do not manually call headers_install Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230825-wip-selftests-v3-2-639963c54109@kernel.org> References: <20230825-wip-selftests-v3-0-639963c54109@kernel.org> In-Reply-To: <20230825-wip-selftests-v3-0-639963c54109@kernel.org> To: Jiri Kosina , Benjamin Tissoires , Shuah Khan , Justin Stitt , Nick Desaulniers , Eduard Zingerman Cc: linux-input@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Benjamin Tissoires , Shuah Khan X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1696521351; l=2048; i=bentiss@kernel.org; s=20230215; h=from:subject:message-id; bh=kepJfzWT2D89KAm/FDIV534BRNofr3W/Lz1wk8g0krs=; b=3Bfa0moweoyJ3qG17TuFnAal4lGdBVWJl4DArxBAd0uyM+iv6oT+49A+bz0vOaTutlhSNd3ej 5Mr7rMhGV02Dli/kpbWgaihnS3rKk5PHBj1kPouo4ijqH4KRYe3sW2N X-Developer-Key: i=bentiss@kernel.org; a=ed25519; pk=7D1DyAVh6ajCkuUTudt/chMuXWIJHlv2qCsRkIizvFw= "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 Tested-by: Nick Desaulniers # Build Signed-off-by: Benjamin Tissoires --- tools/testing/selftests/hid/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests/hid/Makefile index 2e986cbf1a46..a28054113f47 100644 --- a/tools/testing/selftests/hid/Makefile +++ b/tools/testing/selftests/hid/Makefile @@ -21,7 +21,7 @@ CXX ?= $(CROSS_COMPILE)g++ HOSTPKG_CONFIG := pkg-config -CFLAGS += -g -O0 -rdynamic -Wall -Werror -I$(KHDR_INCLUDES) -I$(OUTPUT) +CFLAGS += -g -O0 -rdynamic -Wall -Werror -I$(OUTPUT) LDLIBS += -lelf -lz -lrt -lpthread # Silence some warnings when compiled with clang @@ -65,7 +65,6 @@ BPFTOOLDIR := $(TOOLSDIR)/bpf/bpftool SCRATCH_DIR := $(OUTPUT)/tools BUILD_DIR := $(SCRATCH_DIR)/build INCLUDE_DIR := $(SCRATCH_DIR)/include -KHDR_INCLUDES := $(SCRATCH_DIR)/uapi/include BPFOBJ := $(BUILD_DIR)/libbpf/libbpf.a ifneq ($(CROSS_COMPILE),) HOST_BUILD_DIR := $(BUILD_DIR)/host @@ -151,9 +150,6 @@ else $(Q)cp "$(VMLINUX_H)" $@ endif -$(KHDR_INCLUDES)/linux/hid.h: $(top_srcdir)/include/uapi/linux/hid.h - $(MAKE) -C $(top_srcdir) INSTALL_HDR_PATH=$(SCRATCH_DIR)/uapi headers_install - $(RESOLVE_BTFIDS): $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/resolve_btfids \ $(TOOLSDIR)/bpf/resolve_btfids/main.c \ $(TOOLSDIR)/lib/rbtree.c \ @@ -231,7 +227,7 @@ $(BPF_SKELS): %.skel.h: %.bpf.o $(BPFTOOL) | $(OUTPUT) $(Q)$(BPFTOOL) gen object $(<:.o=.linked1.o) $< $(Q)$(BPFTOOL) gen skeleton $(<:.o=.linked1.o) name $(notdir $(<:.bpf.o=)) > $@ -$(OUTPUT)/%.o: %.c $(BPF_SKELS) $(KHDR_INCLUDES)/linux/hid.h +$(OUTPUT)/%.o: %.c $(BPF_SKELS) $(call msg,CC,,$@) $(Q)$(CC) $(CFLAGS) -c $(filter %.c,$^) $(LDLIBS) -o $@