CVS commit: pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Wed Feb 27 06:23:39 UTC 2019

Modified Files:
        pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64: Makefile buildlink3.mk
            distinfo

Log Message:
Switch this over to a snapshot of the MASTER branch post-2.2 release,
to get proper support for Pinebook.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/Makefile \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/Makefile
diff -u pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/Makefile:1.2 pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/Makefile:1.3
--- pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/Makefile:1.2        Sat Feb 23 06:24:37 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/Makefile    Wed Feb 27 06:23:39 2019
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2019/02/23 06:24:37 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/02/27 06:23:39 martin Exp $
 
-VERSION=       2.0
+VERSION=       2.0.20190222    # v2.0 is too old
 GITHUB_PROJECT=        arm-trusted-firmware
-GITHUB_TAG=    v${VERSION}
+# GITHUB_TAG=  v${VERSION}     # only for real releases
+GITHUB_TAG=    ab3d22473df279c61ed4d4873d26b072dcf887e8
 
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PLATFORM=      sun50i_a64
@@ -21,6 +22,7 @@ USE_TOOLS+=   gmake
 MAKE_FLAGS+=   CROSS_COMPILE=${PREFIX}/cross-aarch64-none-elf/bin/aarch64-none-elf-
 MAKE_FLAGS+=   PLAT=${PLATFORM}
 MAKE_FLAGS+=   DEBUG=1
+# MAKE_FLAGS+= V=1
 MAKE_FLAGS+=   BUILD_STRING=${GITHUB_TAG}
 BUILD_TARGET=  bl31
 
@@ -32,10 +34,8 @@ do-install:
            ${DESTDIR}${PREFIX}/share/arm-trusted-firmware/${PLATFORM}/
 
 
-# XXX kludge. pkgsrc passes down run path flags in LDFLAGS but the
-# cross ld(1) doesn't understand -R. If we pass down -L instead it
-# will be safely ignored.
-COMPILER_RPATH_FLAG=-L
-
+# XXX kludge. pkgsrc passes down run path flags in LDFLAGS assuming
+# gcc is used for linking, but here we call the linker directly.
+COMPILER_RPATH_FLAG=-R
 
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk
diff -u pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk:1.2 pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk:1.3
--- pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk:1.2   Sat Feb 23 06:39:27 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk       Wed Feb 27 06:23:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2019/02/23 06:39:27 martin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2019/02/27 06:23:39 martin Exp $
 
 BUILDLINK_DEPMETHOD.arm-trusted-firmware-sun50i_a64?=  build
 
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        arm-trusted-firmware-su
 .if !defined(ARM_TRUSTED_FIRMWARE_SUN50I_A64_BUILDLINK3_MK)
 ARM_TRUSTED_FIRMWARE_SUN50I_A64_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.arm-trusted-firmware-sun50i_a64+=        arm-trusted-firmware-sun50i_a64>=2.0
+BUILDLINK_API_DEPENDS.arm-trusted-firmware-sun50i_a64+=        arm-trusted-firmware-sun50i_a64>2.0
 BUILDLINK_PKGSRCDIR.arm-trusted-firmware-sun50i_a64?=  ../../sysutils/arm-trusted-firmware-sun50i_a64
 .endif # ARM_TRUSTED_FIRMWARE_SUN50I_A64_BUILDLINK3_MK
 

Index: pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/distinfo
diff -u pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/distinfo:1.1 pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/distinfo:1.2
--- pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/distinfo:1.1        Sat Feb 23 06:20:12 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/distinfo    Wed Feb 27 06:23:39 2019
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2019/02/23 06:20:12 martin Exp $
+$NetBSD: distinfo,v 1.2 2019/02/27 06:23:39 martin 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 (arm-trusted-firmware-2.0.20190222-ab3d22473df279c61ed4d4873d26b072dcf887e8.zip) = 1f69ac8f78d69d90b8058aab57e8ac353cf511c4
+RMD160 (arm-trusted-firmware-2.0.20190222-ab3d22473df279c61ed4d4873d26b072dcf887e8.zip) = 6bd065014ddbd12a17b3ab261f81a3fa3710ea96
+SHA512 (arm-trusted-firmware-2.0.20190222-ab3d22473df279c61ed4d4873d26b072dcf887e8.zip) = 
6f0a9ed7d1eb694015507dc3b618dcc017192f1963dfdd4fb00ba1a18b42539be29b10513bfb7a8535e77b631ccdaa10944900bd984617f19bef0845a61e6d5d
+Size (arm-trusted-firmware-2.0.20190222-ab3d22473df279c61ed4d4873d26b072dcf887e8.zip) = 4924422 bytes