From: Tianling Shen Date: Mon, 15 Apr 2024 07:20:07 +0000 (+0800) Subject: v2ray-geodata: make PKG_RELEASE numeric again X-Git-Url: http://git.openwrt.org/?p=feed%2Fpackages.git;a=commitdiff_plain;h=d7e63d4e24599c66ae9e4c8984398f826108c5c5 v2ray-geodata: make PKG_RELEASE numeric again According to the documentation[1] 'PKG_RELEASE' should be a number, so polulate the APK-style 'r' via 'VERSION' instead. 1. https://openwrt.org/docs/guide-developer/packages#buildpackage_variables Fixes: 30796c59485b ("v2ray-geodata: use APK compatible version schema") Reported-by: Sean Khan Signed-off-by: Tianling Shen --- diff --git a/net/v2ray-geodata/Makefile b/net/v2ray-geodata/Makefile index c10eb41cb9..7329519f10 100644 --- a/net/v2ray-geodata/Makefile +++ b/net/v2ray-geodata/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-geodata -PKG_RELEASE:=r1 +PKG_RELEASE:=1 PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Tianling Shen @@ -51,7 +51,7 @@ define Package/v2ray-geoip $(call Package/v2ray-geodata/template) TITLE:=GeoIP List for V2Ray PROVIDES:=v2ray-geodata xray-geodata xray-geoip - VERSION:=$(GEOIP_VER)-$(PKG_RELEASE) + VERSION:=$(GEOIP_VER)-r$(PKG_RELEASE) LICENSE:=CC-BY-SA-4.0 endef @@ -59,7 +59,7 @@ define Package/v2ray-geosite $(call Package/v2ray-geodata/template) TITLE:=Geosite List for V2Ray PROVIDES:=v2ray-geodata xray-geodata xray-geosite - VERSION:=$(GEOSITE_VER)-$(PKG_RELEASE) + VERSION:=$(GEOSITE_VER)-r$(PKG_RELEASE) LICENSE:=MIT endef @@ -67,7 +67,7 @@ define Package/v2ray-geosite-ir $(call Package/v2ray-geodata/template) TITLE:=Iran Geosite List for V2Ray PROVIDES:=xray-geosite-ir - VERSION:=$(GEOSITE_IRAN_VER)-$(PKG_RELEASE) + VERSION:=$(GEOSITE_IRAN_VER)-r$(PKG_RELEASE) LICENSE:=MIT endef