From 3a59bec6a95a4b8c2a77ad8bf4354dc6311e9d13 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 13 May 2019 08:40:42 +0000
Subject: [PATCH] make: speed up `upgrade' by not doing compression

txz is quite slow and since we do not publish the image we can
simply use a tar file in this case.
---
 Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index dcef61480..6ecef6e92 100644
--- a/Makefile
+++ b/Makefile
@@ -216,6 +216,12 @@ name:
 depends:
 	@echo ${CORE_DEPENDS}
 
+.if ${.TARGETS:Mupgrade}
+PKG_FORMAT?=	tar
+.else
+PKG_FORMAT?=	txz
+.endif
+
 PKG_SCRIPTS=	+PRE_INSTALL +POST_INSTALL \
 		+PRE_UPGRADE +POST_UPGRADE \
 		+PRE_DEINSTALL +POST_DEINSTALL
@@ -285,8 +291,8 @@ package: plist-check package-check clean-wrksrc
 	@${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} install
 	@echo " done"
 	@echo ">>> Packaging files for ${CORE_NAME}-${CORE_PKGVERSION}:"
-	@PORTSDIR=${.CURDIR} ${PKG} create -v -m ${WRKSRC} -r ${WRKSRC} \
-	    -p ${WRKSRC}/plist -o ${PKGDIR}
+	@PORTSDIR=${.CURDIR} ${PKG} create -f ${PKG_FORMAT} -v -m ${WRKSRC} \
+	    -r ${WRKSRC} -p ${WRKSRC}/plist -o ${PKGDIR}
 
 upgrade-check:
 	@if ! ${PKG} info ${CORE_NAME} > /dev/null; then \
@@ -296,8 +302,8 @@ upgrade-check:
 
 upgrade: upgrade-check clean-pkgdir package
 	@${PKG} delete -fy ${CORE_NAME} || true
-	@${PKG} add ${PKGDIR}/*.txz
-	@${LOCALBASE}/etc/rc.restart_webgui
+	${PKG} add ${PKGDIR}/*.${PKG_FORMAT}
+	@pluginctl webgui
 
 lint-shell:
 	@find ${.CURDIR}/src ${.CURDIR}/Scripts \