From 98417ed246a41cb1e1a721bcd3ef0e89f6772b25 Mon Sep 17 00:00:00 2001
From: "Dustin C. Hatch" <dustin@hatch.name>
Date: Thu, 25 Aug 2022 20:43:26 -0500
Subject: [PATCH] p/vm: Upgrade to v1.80.0

Switching from the `golang-package` macro to the `generic-package` macro
in order to make use of upstream's makefiles.  This will ensure that the
correct flags are passed to the Go compiler, especially those related to
embedding the version string in the binary.  Without this, the
`vm_app_version` metrics exposed by each application will be empty.
---
 package/victoriametrics/victoriametrics.hash |  1 +
 package/victoriametrics/victoriametrics.mk   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/package/victoriametrics/victoriametrics.hash b/package/victoriametrics/victoriametrics.hash
index 15fd7c1..c71c2e1 100644
--- a/package/victoriametrics/victoriametrics.hash
+++ b/package/victoriametrics/victoriametrics.hash
@@ -1 +1,2 @@
 sha256 256e1081e6dc9831af8a586cb33e46c3c7b9b9987ec6c1a0b5182b235520b285  victoriametrics-1.78.0.tar.gz
+sha256 73f35e0c432bc769d9fab87748a2f40d9085aaba09aca160f80feca77b81123d  victoriametrics-1.80.0.tar.gz
diff --git a/package/victoriametrics/victoriametrics.mk b/package/victoriametrics/victoriametrics.mk
index 767e00e..d4f59f8 100644
--- a/package/victoriametrics/victoriametrics.mk
+++ b/package/victoriametrics/victoriametrics.mk
@@ -1,4 +1,4 @@
-VICTORIAMETRICS_VERSION = 1.78.0
+VICTORIAMETRICS_VERSION = 1.80.0
 VICTORIAMETRICS_SITE = $(call github,VictoriaMetrics,VictoriaMetrics,v$(VICTORIAMETRICS_VERSION))
 VICTORIAMETRICS_LICENSE = Apache-2.0
 VICTORIAMETRICS_LICENSE_FILES = LICENSE
@@ -8,37 +8,37 @@ VICTORIAMETRICS_TAGS = netgo osusergo nethttpomithttp2 musl
 VICTORIAMETRICS_INSTALL_BINS =
 
 ifeq ($(BR2_PACKAGE_VICTORIAMETRICS_SINGLE),y)
-VICTORIAMETRICS_BUILD_TARGETS = app/victoria-metrics
+VICTORIAMETRICS_BUILD_CMDS = $(MAKE) victoria-metrics
 VICTORIAMETRICS_INSTALL_BINS += victoria-metrics
 endif
 
 ifeq ($(BR2_PACKAGE_VICTORIAMETRICS_VMAGENT),y)
-VICTORIAMETRICS_BUILD_TARGETS += app/vmagent
+VICTORIAMETRICS_BUILD_CMDS += $(MAKE) vmagent
 VICTORIAMETRICS_INSTALL_BINS += vmagent
 endif
 
 ifeq ($(BR2_PACKAGE_VICTORIAMETRICS_VMALERT),y)
-VICTORIAMETRICS_BUILD_TARGETS += app/vmalert
+VICTORIAMETRICS_BUILD_CMDS += $(MAKE) vmalert
 VICTORIAMETRICS_INSTALL_BINS += vmalert
 endif
 
 ifeq ($(BR2_PACKAGE_VICTORIAMETRICS_VMAUTH),y)
-VICTORIAMETRICS_BUILD_TARGETS += app/vmauth
+VICTORIAMETRICS_BUILD_CMDS += $(MAKE) vmauth
 VICTORIAMETRICS_INSTALL_BINS += vmauth
 endif
 
 ifeq ($(BR2_PACKAGE_VICTORIAMETRICS_VMBACKUP),y)
-VICTORIAMETRICS_BUILD_TARGETS += app/vmbackup
+VICTORIAMETRICS_BUILD_CMDS += $(MAKE) vmbackup
 VICTORIAMETRICS_INSTALL_BINS += vmbackup
 endif
 
 ifeq ($(BR2_PACKAGE_VICTORIAMETRICS_VMRESTORE),y)
-VICTORIAMETRICS_BUILD_TARGETS += app/vmrestore
+VICTORIAMETRICS_BUILD_CMDS += $(MAKE) vmrestore
 VICTORIAMETRICS_INSTALL_BINS += vmrestore
 endif
 
 ifeq ($(BR2_PACKAGE_VICTORIAMETRICS_VMCTL),y)
-VICTORIAMETRICS_BUILD_TARGETS += app/vmctl
+VICTORIAMETRICS_BUILD_CMDS += $(MAKE) vmctl
 VICTORIAMETRICS_INSTALL_BINS += vmctl
 endif
 
@@ -70,4 +70,4 @@ define VICTORIAMETRICS_USERS
 	victoriametrics -1 victoriametrics -1 * /var/lib/victoria-metrics /sbin/nologin -
 endef
 
-$(eval $(golang-package))
+$(eval $(generic-package))