- Re-factor the arm-trusted-firmware packages into common definitions and

  build infrastructure.
- Update arm-trusted-firmware to v2.3.

4 files changed, 16 insertions, 44 deletions

diff --git a/sysutils/arm-trusted-firmware-fiptool/Makefile b/sysutils/arm-trusted-firmware-fiptool/Makefile
index 20db2a7a9be..445a88a7b75 100644
--- a/sysutils/arm-trusted-firmware-fiptool/Makefile
+++ b/sysutils/arm-trusted-firmware-fiptool/Makefile
@@ -1,20 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2019/05/14 04:08:51 thorpej Exp $
+# $NetBSD: Makefile,v 1.5 2020/06/30 14:33:15 thorpej Exp $
 
-GITHUB_PROJECT=	arm-trusted-firmware
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-DISTNAME=	arm-trusted-firmware-2.0
-PKGNAME=	${DISTNAME:S/firmware/firmware-fiptool/}
-PKGREVISION=	2
-CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GITHUB:=ARM-software/}
-EXTRACT_SUFX=	.zip
+# We override WRKSRC, so we provide our own patches (and thus distinfo)
+DISTINFO_FILE=	${.CURDIR}/distinfo
+PATCHDIR=	${.CURDIR}/patches
 
-MAINTAINER=	port-arm@NetBSD.org
-HOMEPAGE=	https://github.com/ARM-software/arm-trusted-firmware/
-COMMENT=	ARM Trusted Firmware fiptool
-LICENSE=	modified-bsd
+.include "../../sysutils/arm-trusted-firmware/arm-trusted-firmware-dist.mk"
 
-USE_TOOLS+=	gmake
+PKGNAME=	${DISTNAME:S/firmware/firmware-fiptool/}
 WRKSRC=		${WRKDIR}/${DISTNAME}/tools/fiptool
 
 INSTALLATION_DIRS=	bin
diff --git a/sysutils/arm-trusted-firmware-fiptool/distinfo b/sysutils/arm-trusted-firmware-fiptool/distinfo
index 835ed12bcde..16405263391 100644
--- a/sysutils/arm-trusted-firmware-fiptool/distinfo
+++ b/sysutils/arm-trusted-firmware-fiptool/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2019/05/14 04:08:51 thorpej Exp $
+$NetBSD: distinfo,v 1.4 2020/06/30 14:33:15 thorpej Exp $
 
-SHA1 (arm-trusted-firmware-2.0.zip) = d789e7aac0e987d8524a11587cc598bf5d894581
-RMD160 (arm-trusted-firmware-2.0.zip) = a7a49da9b0e27c45df867ea1de4809cb89d9b8cc
-SHA512 (arm-trusted-firmware-2.0.zip) = 39180d12be7532b742949f162759793e97c0a6ac835d66aaf857bd3c1d9c0ab10b7ccd5e6a47831ad909a92b4727e181c82a74c90b5d941e469f3a5cf66b0e7c
-Size (arm-trusted-firmware-2.0.zip) = 3949049 bytes
-SHA1 (patch-Makefile) = b5c27e44135e6a99c1a598daec91db58d6ff894d
-SHA1 (patch-fiptool_uuid_parse) = 6ef5785e2f696e0297239cb597b94dd3ac4a6c7d
+SHA1 (arm-trusted-firmware-2.3.zip) = 7fd1f1c896de819f3fa262de78ba4641cdd0e436
+RMD160 (arm-trusted-firmware-2.3.zip) = 6e17330effbc7524def684c3683bbdd3a48ad05d
+SHA512 (arm-trusted-firmware-2.3.zip) = 1ee358fef1a4cda68d01857d3c822034b3ab1cc68918c7a4087e95f3f2b9b41a12431a8091847f5897ae9a403826d8fcfde0a8a689c69808ff06e737a845db28
+Size (arm-trusted-firmware-2.3.zip) = 5797101 bytes
+SHA1 (patch-Makefile) = 90cedf2c6c04fbf00bd8b2782add95b46c2ebcc0
diff --git a/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile b/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile
index 271f3b4dddc..b05af947e96 100644
--- a/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile
+++ b/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile
@@ -1,13 +1,13 @@
-$NetBSD: patch-Makefile,v 1.1 2019/01/20 17:39:05 wiz Exp $
+$NetBSD: patch-Makefile,v 1.2 2020/06/30 14:33:15 thorpej Exp $
 
 Honor LDFLAGS.
 
---- Makefile.orig	2018-10-02 13:13:37.000000000 +0000
-+++ Makefile
+--- Makefile.orig	2020-04-20 15:56:43.000000000 +0000
++++ Makefile	2020-06-22 01:21:57.959255753 +0000
 @@ -37,7 +37,7 @@ all: ${PROJECT}
  
  ${PROJECT}: ${OBJECTS} Makefile
- 	@echo "  LD      $@"
+ 	@echo "  HOSTLD  $@"
 -	${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
 +	${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDFLAGS} ${LDLIBS}
  	@${ECHO_BLANK_LINE}
diff --git a/sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse b/sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse
deleted file mode 100644
index 3cdff328f27..00000000000
--- a/sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-fiptool_uuid_parse,v 1.1 2019/05/14 04:08:51 thorpej Exp $
-
-Patch from upstream to fix UUID parsing bug in --blob handling.
-
---- fiptool.c.orig	2019-05-14 04:51:36.000000000 +0000
-+++ fiptool.c
-@@ -271,10 +271,10 @@ static void uuid_from_str(uuid_t *u, con
- 	    &u->node[2], &u->node[3],
- 	    &u->node[4], &u->node[5]);
- 	/*
--	 * Given the format specifier above, we expect 11 items to be scanned
-+	 * Given the format specifier above, we expect 16 items to be scanned
- 	 * for a properly formatted UUID.
- 	 */
--	if (n != 11)
-+	if (n != 16)
- 		log_errx("Invalid UUID: %s", s);
- }
-