nettrace: auto detect 4.X kernel and use COMPAT for it

Signed-off-by: Menglong Dong <imagedong@tencent.com>

Author: menglongdong

.gitignore

@@ -10,3 +10,4 @@ GPATH
 GTAGS
 GRTAGS
 kheaders.h
+build.sh

Makefile

@@ -58,10 +58,12 @@ pack:
 
 rpm:
 	@make clean
+	@make man
 	@rm -rf ${SOURCE_DIR} && mkdir -p ${SOURCE_DIR}
 	@cp -r * ${SOURCE_DIR}/
+	@sed -i 's/%{VERSION}/$(VERSION)/' ${SOURCE_DIR}/script/nettrace.spec
 	@cd ~/rpmbuild/SOURCES/ && tar -czf nettrace-${VERSION}.tar.gz	\
 		nettrace-${VERSION}
-	@rpmbuild -ba $(SCRIPT)/nettrace.spec
+	@rpmbuild -D 'dist $(RELEASE)' -ba ${SOURCE_DIR}/script/nettrace.spec
 
 .PHONY: $(targets)

common.mk

@@ -4,8 +4,8 @@ COMMON_SHARED	:= $(ROOT)/shared/pkt_utils.c $(COMPONENT)/net_utils.c \
 		   $(COMPONENT)/arg_parse.c $(COMPONENT)/sys_utils.c
 
 CFLAGS		+= -I./ -I$(ROOT)/shared/bpf/
-BPF_CFLAGS	:= $(CFLAGS) -I$(LIBBPF) -Wno-unused-function
-HOST_CFLAGS	:= \
+BPF_CFLAGS	= $(CFLAGS) -I$(LIBBPF) -Wno-unused-function
+HOST_CFLAGS	= \
 		-lbpf -lelf -lz -g -O2 -static $(CFLAGS) \
 		-Wno-deprecated-declarations \
 		-I$(ROOT)/shared/ -I$(ROOT)/component

script/nettrace.spec

@@ -2,9 +2,9 @@ Summary: A skb (network package) trace tool for kernel
 
 Name: nettrace
 
-Version: %{getenv:VERSION}
+Version: %{VERSION}
 
-Release: %{getenv:RELEASE}
+Release: %{?dist}
 
 License: GPL
 

src/Makefile

@@ -1,23 +1,26 @@
-ROOT ?= $(abspath ../)
-bpf_progs := progs/kprobe progs/tracing
-progs := nettrace
-prog-nettrace-origin = trace.c $(COMMON_SHARED) \
-		       trace_probe.c trace_tracing.c analysis.c \
-		       $(COMPONENT)/parse_sym.c trace_group.c \
-		       drop_reason.h
-
-prog-nettrace = $(prog-nettrace-origin) nettrace.c
-
-ifdef COMPAT
-CFLAGS += -DMAP_CONFIG
-endif
+ROOT		?= $(abspath ../)
+bpf_progs	:= progs/kprobe progs/tracing
+progs		:= nettrace
+prog-nettrace-origin = \
+		trace.c $(COMMON_SHARED) trace_probe.c trace_tracing.c \
+		analysis.c $(COMPONENT)/parse_sym.c trace_group.c \
+		drop_reason.h
+prog-nettrace	= $(prog-nettrace-origin) nettrace.c
 
 ifdef KERN_VER
-CFLAGS += -DKERN_VER=$(KERN_VER)
+	CFLAGS += -DKERN_VER=$(KERN_VER)
 endif
 
 include ../common.mk
 
+# check if current kernel version is 4.X
+COMPAT ?= $(if $(KERNEL),$(shell cat $(HEADERS)/Makefile | grep \
+	  'VERSION = 4'),$(shell uname -r | grep ^4))
+
+ifneq ($(strip $(COMPAT)),)
+	CFLAGS += -DMAP_CONFIG
+endif
+
 NFT_HEADER	:= $(HEADERS)/include/net/netfilter/nf_tables.h
 ifeq ($(shell cat $(NFT_HEADER) 2>&1 | grep xt_action_param),)
 	BPF_CFLAGS += -DNFT_HIGH_VERSION