From 5ef913ef7f61df26c5c11882b5d1d21ceecf2071 Mon Sep 17 00:00:00 2001 From: CFC4N Date: Tue, 2 Jan 2024 00:44:11 +0800 Subject: [PATCH] makefile: Optimize the feature list for the Android version retaining the three essential modules: openssl, broingssl, and gotls. Exclude BPF bytecode for kernels with an architecture smaller than arm64 and versions less than 5.2. Signed-off-by: CFC4N --- Makefile | 21 ++++++++++++--------- builder/Makefile.release | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 871c846d3..ea081cba3 100644 --- a/Makefile +++ b/Makefile @@ -190,23 +190,26 @@ BPF_NOCORE_TAG = $(subst .,_,$(KERN_RELEASE)).$(subst .,_,$(VERSION)) # # BPF Source file # - -TARGETS := kern/openssl_1_1_1a +TARGETS := kern/boringssl_a_13 +TARGETS += kern/boringssl_a_14 +TARGETS += kern/openssl_1_1_1a TARGETS += kern/openssl_1_1_1b TARGETS += kern/openssl_1_1_1d TARGETS += kern/openssl_1_1_1j TARGETS += kern/openssl_1_1_0a TARGETS += kern/openssl_1_0_2a TARGETS += kern/openssl_3_0_0 -TARGETS += kern/boringssl_a_13 -TARGETS += kern/boringssl_a_14 -TARGETS += kern/bash -TARGETS += kern/gnutls -TARGETS += kern/nspr -TARGETS += kern/mysqld -TARGETS += kern/postgres TARGETS += kern/gotls +ifeq ($(ANDROID),0) + TARGETS += kern/bash + TARGETS += kern/gnutls + TARGETS += kern/nspr + TARGETS += kern/mysqld + TARGETS += kern/postgres +endif + + # Generate file name-scheme based on TARGETS KERN_SOURCES = ${TARGETS:=_kern.c} KERN_OBJECTS = ${KERN_SOURCES:.c=.o} diff --git a/builder/Makefile.release b/builder/Makefile.release index 2f5969e6b..d830f3a66 100644 --- a/builder/Makefile.release +++ b/builder/Makefile.release @@ -235,7 +235,7 @@ build_deb: # 创建软件包目录结构 $(CMD_RM) -rf $(BUILD_DIR) $(CMD_MKDIR) -p $(BUILD_DIR)/DEBIAN - $(CMD_MKDIR) -p $(BUILD_DIR)/usr/local/bin # 这里是例子，请根据实际情况更改 + $(CMD_MKDIR) -p $(BUILD_DIR)/usr/local/bin # 复制程序文件到软件包目录 $(CMD_CP) bin/ecapture $(BUILD_DIR)/usr/local/bin/ecapture # 将二进制文件复制到目标位置 # 创建控制文件 (DEBIAN/control)