crowdsec: remove go version tag

Let crowdsec build system set go version itself.

Link: https://github.com/openwrt/packages/pull/28309
Signed-off-by: George Sapkin <redacted>

diff --git a/net/crowdsec-firewall-bouncer/Makefile b/net/crowdsec-firewall-bouncer/Makefile
index 63e3caae9bf8f4cf72aece0b516439e0d70bdb18..8c8189f9a5a9f288d06657b89b04d18ad6a7a6cb 100644 (file)
--- a/net/crowdsec-firewall-bouncer/Makefile
+++ b/net/crowdsec-firewall-bouncer/Makefile
@@ -23,7 +23,6 @@ PKG_BUILD_FLAGS:=no-mips16
 PKG_BUILD_DIR:=$(BUILD_DIR)/cs-firewall-bouncer-$(PKG_VERSION)
 
 CSFB_BUILD_VERSION?=v$(PKG_VERSION)
-CSFB_BUILD_GOVERSION:=$(shell go version | cut -d " " -f3 | sed -E 's/[go]+//g')
 CSFB_BUILD_TIMESTAMP:=$(shell date +%F"_"%T)
 CSFB_BUILD_TAG:=openwrt-$(PKG_VERSION)-$(PKG_RELEASE)
 CSFB_VERSION_PKG:=github.com/crowdsecurity/cs-firewall-bouncer/pkg/version
@@ -32,8 +31,7 @@ GO_PKG:=github.com/crowdsecurity/cs-firewall-bouncer
 GO_PKG_INSTALL_ALL:=1
 GO_PKG_LDFLAGS_X:=$(CSFB_VERSION_PKG).Version=$(CSFB_BUILD_VERSION) \
        $(CSFB_VERSION_PKG).BuildDate=$(CSFB_BUILD_TIMESTAMP) \
-       $(CSFB_VERSION_PKG).Tag=$(CSFB_BUILD_TAG) \
-       $(CSFB_VERSION_PKG).GoVersion=$(CSFB_BUILD_GOVERSION)
+       $(CSFB_VERSION_PKG).Tag=$(CSFB_BUILD_TAG)
 
 include $(INCLUDE_DIR)/package.mk
 include ../../lang/golang/golang-package.mk

diff --git a/net/crowdsec/Makefile b/net/crowdsec/Makefile
index a69012bd2725efa12b7067f03cb2b0a3581f8f4d..22b73aa8eee79b5c1a6820879ff6a88a47426d06 100644 (file)
--- a/net/crowdsec/Makefile
+++ b/net/crowdsec/Makefile
@@ -24,7 +24,6 @@ PKG_BUILD_FLAGS:=no-mips16
 CWD_SYSTEM:=openwrt
 
 CWD_BUILD_VERSION?=v$(PKG_VERSION)
-CWD_BUILD_GOVERSION:=$(shell go version | cut -d " " -f3 | sed -E 's/[go]+//g')
 CWD_BUILD_CODENAME:=alphaga
 CWD_BUILD_TIMESTAMP:=$(shell date +%F"_"%T)
 CWD_BUILD_TAG:=openwrt-$(PKG_VERSION)-$(PKG_RELEASE)
@@ -37,8 +36,7 @@ GO_PKG_LDFLAGS_X:=$(CWD_VERSION_PKG).Version=$(CWD_BUILD_VERSION) \
        $(CWD_VERSION_PKG).System=$(CWD_SYSTEM) \
        $(CWD_VERSION_PKG).BuildDate=$(CWD_BUILD_TIMESTAMP) \
        $(CWD_VERSION_PKG).Codename=$(CWD_BUILD_CODENAME)  \
-       $(CWD_VERSION_PKG).Tag=$(CWD_BUILD_TAG) \
-       $(CWD_VERSION_PKG).GoVersion=$(CWD_BUILD_GOVERSION)
+       $(CWD_VERSION_PKG).Tag=$(CWD_BUILD_TAG)
 
 include $(INCLUDE_DIR)/package.mk
 include ../../lang/golang/golang-package.mk