From e4d5478662c117c6fa6f4b8d48a3ab4be06cbbbb Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 21 Dec 2021 12:07:37 +0100
Subject: [PATCH] pkg: avoid upgrades if already done, use VERSIONBIN

---
 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8620ffe56..fa363c621 100644
--- a/Makefile
+++ b/Makefile
@@ -332,6 +332,10 @@ upgrade-check:
 		echo ">>> Cannot find package.  Please run 'opnsense-update -t ${CORE_NAME}'" >&2; \
 		exit 1; \
 	fi
+	@if [ "$$(${VERSIONBIN} -v)" = "${CORE_PKGVERSION}" ]; then \
+		echo "Installed version already matches ${CORE_PKGVERSION}" >&2; \
+		exit 1; \
+	fi
 
 upgrade: upgrade-check clean-pkgdir package
 	@${PKG} delete -fy ${CORE_NAME} || true
@@ -474,8 +478,8 @@ rebase:
 	@git checkout master
 
 test: want-phpunit7-php${CORE_PHP}
-	@if [ "$$(${PKG} query %n-%v ${CORE_NAME})" != "${CORE_NAME}-${CORE_PKGVERSION}" ]; then \
-		echo "Installed version does not match, expected ${CORE_NAME}-${CORE_PKGVERSION}"; \
+	@if [ "$$(${VERSIONBIN} -v)" != "${CORE_PKGVERSION}" ]; then \
+		echo "Installed version does not match, expected ${CORE_PKGVERSION}"; \
 		exit 1; \
 	fi
 	@cd ${.CURDIR}/src/opnsense/mvc/tests && \