From a48d2420fbd47b7c777d7dd7ce33628f8f23da07 Mon Sep 17 00:00:00 2001 From: CFC4N Date: Mon, 1 Jan 2024 22:56:46 +0800 Subject: [PATCH] builder: add debian package build script. Signed-off-by: CFC4N --- .github/workflows/release.yml | 2 +- README.md | 2 +- builder/Makefile.release | 55 +++++++++++++++++++++++++++++++---- 3 files changed, 51 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e0b0f903a..3026b5a85 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -184,7 +184,7 @@ jobs: SNAPSHOT_VERSION=${{ steps.get_tags.outputs.VERSION }} echo "#${SNAPSHOT_VERSION}#" if [ -z "${SNAPSHOT_VERSION}" ]; then - SNAPSHOT_VERSION="v0.0.0" + SNAPSHOT_VERSION="0.0.0" fi TAR_DIR=ecapture-${SNAPSHOT_VERSION}-android_core-${UNAME_M} RELEASE_NOTES=${OUTPUT_DIR}/release_notes.txt diff --git a/README.md b/README.md index ceab168f7..12997efc1 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![CI](https://github.com/gojue/ecapture/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/gojue/ecapture/actions/workflows/code-analysis.yml) [![Github Version](https://img.shields.io/github/v/release/gojue/ecapture?display_name=tag&include_prereleases&sort=semver)](https://github.com/gojue/ecapture/releases) -### eCapture(旁观者): capture SSL/TLS text content without CA cert Using eBPF. +### eCapture(旁观者): capture SSL/TLS text content without a CA certificate using eBPF. > **Note** > diff --git a/builder/Makefile.release b/builder/Makefile.release index f3908ddad..a3a1f2b41 100644 --- a/builder/Makefile.release +++ b/builder/Makefile.release @@ -4,7 +4,7 @@ .PHONY: all all: help -release: snapshot snapshot_android publish +release: snapshot build_deb snapshot_android publish # # make @@ -28,9 +28,19 @@ CMD_TOUCH ?= touch CMD_MKDIR ?= mkdir CMD_MV ?= mv CMD_CP ?= cp +CMD_DPKG-DEB ?= dpkg-deb UNAME_M := $(shell uname -m) SNAPSHOT_VERSION ?= $(shell git rev-parse HEAD) +BUILD_DATE := $(shell date +%Y-%m-%d) +ARCH := $(UNAME_M) +ifeq ($(UNAME_M), x86_64) + ARCH = amd64 +endif + +ifeq ($(UNAME_M), aarch64) + ARCH = arm64 +endif .ONESHELL: .check_%: @@ -128,6 +138,16 @@ $(OUTPUT_DIR): $(CMD_MKDIR) -p $@ # $(CMD_TOUCH) $(RELEASE_NOTES) +# DEB 软件包的名称和版本 +PACKAGE_NAME = ecapture +PACKAGE_DESC = eCapture(旁观者): Capture SSL/TLS text content without a CA certificate using eBPF. This tool is compatible with Linux/Android x86_64/Aarch64. +PACKAGE_HOMEPAGE = https://ecapture.cc +PACKAGE_MAINTAINER = CFC4N +OUT_DEB_FILE = $(OUTPUT_DIR)/$(PACKAGE_NAME)_$(SNAPSHOT_VERSION)_$(ARCH).deb + +# 构建目录 +BUILD_DIR = build + # # Create a release snapshot # @@ -146,14 +166,14 @@ snapshot: \ # build binaries $(MAKE) clean - $(MAKE) nocore + $(MAKE) nocore RELEASE_TAG=$(SNAPSHOT_VERSION) # create the tar ball and checksum files $(CMD_MKDIR) -p $(TAR_DIR) $(CMD_CP) LICENSE $(TAR_DIR)/LICENSE $(CMD_CP) CHANGELOG.md $(TAR_DIR)/CHANGELOG.md $(CMD_CP) README.md $(TAR_DIR)/README.md $(CMD_CP) README_CN.md $(TAR_DIR)/README_CN.md - $(CMD_MV) $(OUTPUT_DIR)/ecapture $(TAR_DIR)/ecapture + $(CMD_CP) $(OUTPUT_DIR)/ecapture $(TAR_DIR)/ecapture $(CMD_CP) $(RELEASE_NOTES) $(OUTPUT_DIR)/release_notes.txt $(CMD_TAR) -czf $(OUT_ARCHIVE) $(TAR_DIR) cd $(OUTPUT_DIR) @@ -170,14 +190,14 @@ snapshot_android: \ # build binaries $(MAKE) clean - ANDROID=1 $(MAKE) nocore + ANDROID=1 $(MAKE) nocore RELEASE_TAG=$(SNAPSHOT_VERSION) # create the tar ball and checksum files $(CMD_MKDIR) -p $(TAR_DIR_ANDROID) $(CMD_CP) LICENSE $(TAR_DIR_ANDROID)/LICENSE $(CMD_CP) CHANGELOG.md $(TAR_DIR_ANDROID)/CHANGELOG.md $(CMD_CP) README.md $(TAR_DIR_ANDROID)/README.md $(CMD_CP) README_CN.md $(TAR_DIR_ANDROID)/README_CN.md - $(CMD_MV) $(OUTPUT_DIR)/ecapture $(TAR_DIR_ANDROID)/ecapture + $(CMD_CP) $(OUTPUT_DIR)/ecapture $(TAR_DIR_ANDROID)/ecapture $(CMD_CP) $(RELEASE_NOTES) $(TAR_DIR_ANDROID)/release_notes.txt $(CMD_TAR) -czf $(OUT_ARCHIVE_ANDROID) $(TAR_DIR_ANDROID) cd $(OUTPUT_DIR) @@ -190,6 +210,7 @@ publish: \ $(OUT_ARCHIVE) \ $(OUT_ARCHIVE_ANDROID) \ $(OUT_CHECKSUMS) \ + $(OUT_DEB_FILE) \ | .check_tree \ .check_$(CMD_GITHUB) # @@ -199,4 +220,26 @@ publish: \ .PHONY: clean clean: # - $(MAKE) clean \ No newline at end of file + $(MAKE) clean + +.PHONY: deb +deb: snapshot build_deb + +# 用于构建DEB包的目标 +build_deb: + # 创建软件包目录结构 + $(CMD_RM) -rf $(BUILD_DIR) + $(CMD_MKDIR) -p $(BUILD_DIR)/DEBIAN + $(CMD_MKDIR) -p $(BUILD_DIR)/usr/local/bin # 这里是例子，请根据实际情况更改 + # 复制程序文件到软件包目录 + $(CMD_CP) bin/ecapture $(BUILD_DIR)/usr/local/bin/ecapture # 将二进制文件复制到目标位置 + # 创建控制文件 (DEBIAN/control) + echo "Package: $(PACKAGE_NAME)" > $(BUILD_DIR)/DEBIAN/control + echo "Version: $(SNAPSHOT_VERSION)" >> $(BUILD_DIR)/DEBIAN/control + echo "BuildDate: $(BUILD_DATE)" >> $(BUILD_DIR)/DEBIAN/control + echo "Architecture: $(ARCH)" >> $(BUILD_DIR)/DEBIAN/control + echo "Maintainer: $(PACKAGE_MAINTAINER)" >> $(BUILD_DIR)/DEBIAN/control + echo "Description: $(PACKAGE_DESC)" >> $(BUILD_DIR)/DEBIAN/control + echo "Homepage: $(PACKAGE_HOMEPAGE)" >> $(BUILD_DIR)/DEBIAN/control + # 构建DEB包 + $(CMD_DPKG-DEB) --build $(BUILD_DIR) $(OUT_DEB_FILE) \ No newline at end of file