From 1353851f1d4de3794386658360ff4b0c0a50e6da Mon Sep 17 00:00:00 2001 From: zxlhhyccc Date: Sat, 16 Nov 2024 22:51:02 +0800 Subject: [PATCH] lua-neturl: make pkg release apk compatible/luci-app-ssr-plus: Optimize code. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、lua-neturl: CI 使用的分支 ImmortalWrt 已默认编译 APK，如不修改，会使 CI 编译失败并同时导致 CI 编译luci-app-ssr-plus失败。 2、luci-app-ssr-plus: 编译错误如下： ``` ./etc/init.d/shadowsocksr: uci command not found grep: /tmp/dnasmq.conf: not such file or directory ``` Co-authored-by: Tianling Shen Signed-off-by: Zxl hhyccc --- lua-neturl/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lua-neturl/Makefile b/lua-neturl/Makefile index 0f6b16f355c..5f923840e27 100644 --- a/lua-neturl/Makefile +++ b/lua-neturl/Makefile @@ -5,12 +5,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=neturl -PKG_VERSION:=1.1-1 -PKG_RELEASE:=3 +PKG_REAL_VERSION:=1.1-1 +PKG_VERSION:=$(subst -,.,$(PKG_REAL_VERSION)) +PKG_RELEASE:=4 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/golgote/neturl/tar.gz/v$(PKG_VERSION)? +PKG_SOURCE:=$(PKG_NAME)-$(PKG_REAL_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/golgote/neturl/tar.gz/v$(PKG_REAL_VERSION)? PKG_HASH:=25f3a94ba9f435ef1395555de2bf17d6f934d789fa515ed965405919e42be27b +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_REAL_VERSION) PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MIT