From 337704e62e8a5d85160d83bb808e0e46dbd073d6 Mon Sep 17 00:00:00 2001 From: Hailong Liu Date: Tue, 31 May 2022 18:01:21 +0800 Subject: [PATCH 1/2] lib/uapi: Fix build fail for looking for path Signed-off-by: Hailong Liu --- source/mk/bpf.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/mk/bpf.mk b/source/mk/bpf.mk index baef246e..c5987bed 100644 --- a/source/mk/bpf.mk +++ b/source/mk/bpf.mk @@ -14,7 +14,7 @@ endif CFLAGS += $(EXTRA_CLFAGS) -g -O2 -Wall LDFLAGS += $(EXTRA_LDFLAGS) -INCLUDES += $(EXTRA_INCLUDES) -I$(OBJPATH) -I$(SRC)/lib/internal/ebpf -I$(OUTPUT) -I$(OBJ_LIB_PATH) -I$(SRC)/lib/internal/ebpf/libbpf/include/uapi +INCLUDES += $(EXTRA_INCLUDES) -I$(OBJPATH) -I$(SRC)/lib/internal/ebpf -I$(OUTPUT) -I$(OBJ_LIB_PATH) -I$(SRC)/lib/internal/ebpf/libbpf/include/uapi -I$(SRC)/lib/uapi/include ifeq ($(V),1) Q = @@ -42,7 +42,7 @@ all: $(target) target_rule $(target): $(target_cobjs) $(bpfskel) $(LIBBPF_OBJ) $(call msg,BINARY,$@) - $(Q)$(CC) $(CFLAGS) $(INCLUDES) $^ -lelf -lz -o $(OUTPUT)/$@ $(LDFLAGS) + $(Q)$(CC) $(CFLAGS) $(INCLUDES) $^ -lelf -lz -o $(OUTPUT)/$@ -L$(OBJ_LIB_PATH) $(LDFLAGS) $(target_cobjs): $(cobjs) $(cobjs): %.o : %.c $(bpfskel) -- Gitee From bdd478cc1bcddf784ef4c8488b54698926cb3b58 Mon Sep 17 00:00:00 2001 From: Hailong Liu Date: Thu, 2 Jun 2022 09:22:17 +0800 Subject: [PATCH 2/2] bpf.mk: Fix sysak list show nothing with bpf Use TARGET_PATH replace OUTPUT env-path values, so that target.inc can parse the header path. Signed-off-by: Hailong Liu --- source/mk/bpf.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/mk/bpf.mk b/source/mk/bpf.mk index c5987bed..9f17b4f6 100644 --- a/source/mk/bpf.mk +++ b/source/mk/bpf.mk @@ -7,14 +7,14 @@ ARCH := $(shell uname -m | sed 's/x86_64/x86/') LIBBPF_OBJ += $(OBJ_LIB_PATH)/libbpf.a ifeq ($(KERNEL_DEPEND), Y) -OUTPUT := $(OBJ_TOOLS_PATH) +TARGET_PATH := $(OBJ_TOOLS_PATH) else -OUTPUT := $(OBJ_TOOLS_ROOT) +TARGET_PATH := $(OBJ_TOOLS_ROOT) endif CFLAGS += $(EXTRA_CLFAGS) -g -O2 -Wall LDFLAGS += $(EXTRA_LDFLAGS) -INCLUDES += $(EXTRA_INCLUDES) -I$(OBJPATH) -I$(SRC)/lib/internal/ebpf -I$(OUTPUT) -I$(OBJ_LIB_PATH) -I$(SRC)/lib/internal/ebpf/libbpf/include/uapi -I$(SRC)/lib/uapi/include +INCLUDES += $(EXTRA_INCLUDES) -I$(OBJPATH) -I$(SRC)/lib/internal/ebpf -I$(TARGET_PATH) -I$(OBJ_LIB_PATH) -I$(SRC)/lib/internal/ebpf/libbpf/include/uapi -I$(SRC)/lib/uapi/include ifeq ($(V),1) Q = @@ -23,7 +23,7 @@ else Q = @ msg = @printf ' %-8s %s%s\n' \ "$(1)" \ - "$(patsubst $(abspath $(OUTPUT))/%,%,$(2))" \ + "$(patsubst $(abspath $(TARGET_PATH))/%,%,$(2))" \ "$(if $(3), $(3))"; MAKEFLAGS += --no-print-directory endif @@ -42,7 +42,7 @@ all: $(target) target_rule $(target): $(target_cobjs) $(bpfskel) $(LIBBPF_OBJ) $(call msg,BINARY,$@) - $(Q)$(CC) $(CFLAGS) $(INCLUDES) $^ -lelf -lz -o $(OUTPUT)/$@ -L$(OBJ_LIB_PATH) $(LDFLAGS) + $(Q)$(CC) $(CFLAGS) $(INCLUDES) $^ -lelf -lz -o $(TARGET_PATH)/$@ -L$(OBJ_LIB_PATH) $(LDFLAGS) $(target_cobjs): $(cobjs) $(cobjs): %.o : %.c $(bpfskel) -- Gitee