From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roman Gushchin Subject: [RFC PATCH net-next] tools/bpftool: use version from the kernel source tree Date: Wed, 20 Dec 2017 20:19:43 +0000 Message-ID: <20171220201943.24440-1-guro@fb.com> Mime-Version: 1.0 Content-Type: text/plain Cc: , , , Roman Gushchin , Jakub Kicinski , Alexei Starovoitov , Daniel Borkmann To: Return-path: Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:41174 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755222AbdLTUUb (ORCPT ); Wed, 20 Dec 2017 15:20:31 -0500 Sender: netdev-owner@vger.kernel.org List-ID: Bpftool determines it's own version based on the kernel version, which is picked from the linux/version.h header. It's strange to use the version of the installed kernel headers, and makes much more sense to use the version of the actual source tree, where bpftool sources are. This patch adds $(srctree)/usr/include to the list of include files, which causes bpftool to use the version from the source tree. Example: before: $ bpftool version bpftool v4.14.6 after: $ bpftool version bpftool v4.15.0 Signed-off-by: Roman Gushchin Cc: Jakub Kicinski Cc: Alexei Starovoitov Cc: Daniel Borkmann --- tools/bpf/bpftool/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index 9c089cfa5f3f..6864d416c49e 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -37,7 +37,9 @@ CC = gcc CFLAGS += -O2 CFLAGS += -W -Wall -Wextra -Wno-unused-parameter -Wshadow -CFLAGS += -D__EXPORTED_HEADERS__ -I$(srctree)/tools/include/uapi -I$(srctree)/tools/include -I$(srctree)/tools/lib/bpf -I$(srctree)/kernel/bpf/ +CFLAGS += -D__EXPORTED_HEADERS__ -I$(srctree)/tools/include/uapi +CFLAGS += -I$(srctree)/tools/include -I$(srctree)/tools/lib/bpf +CFLAGS += -I$(srctree)/kernel/bpf/ -I$(srctree)/usr/include LIBS = -lelf -lbfd -lopcodes $(LIBBPF) INSTALL ?= install -- 2.14.3