CVS commit: pkgsrc/sysutils

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Sun Feb 18 16:25:45 UTC 2018

Modified Files:
        pkgsrc/sysutils/u-boot-nanopi-neo-plus2: Makefile
        pkgsrc/sysutils/u-boot-nanopi-neo2: Makefile
        pkgsrc/sysutils/u-boot-pine64: Makefile
        pkgsrc/sysutils/u-boot-pinebook: Makefile
Added Files:
        pkgsrc/sysutils/arm-trusted-firmware-sun50iw1p1: buildlink3.mk

Log Message:
Add buildlink3.mk for sun50iw1p1 ATF and use it. Bump pkg revision where
necessary.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/u-boot-pine64/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/u-boot-pinebook/Makefile

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

Modified files:

Index: pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile
diff -u pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile:1.1 pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile:1.2
--- pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile:1.1        Wed Jan 10 00:55:27 2018
+++ pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile    Sun Feb 18 16:25:45 2018
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.1 2018/01/10 00:55:27 jakllsch Exp $
+# $NetBSD: Makefile,v 1.2 2018/02/18 16:25:45 jmcneill Exp $
 
-PKGREVISION=           1
+PKGREVISION=           2
 
 UBOOT_TARGET=          nanopi-neo-plus2
 UBOOT_CONFIG=          nanopi_neo_plus2_defconfig
 UBOOT_BIN=             u-boot-sunxi-with-spl.bin
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
-PKG_DEFAULT_OPTIONS+=  el1
+#PKG_DEFAULT_OPTIONS+= el1
+PKG_DEFAULT_OPTIONS+=  debug
 
 post-extract:
        ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
 
-BUILD_DEPENDS+=                arm-trusted-firmware-sun50iw1p1-[0-9]*:../../sysutils/arm-trusted-firmware-sun50iw1p1
-
 post-build:
        ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
 
+.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"

Index: pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile
diff -u pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile:1.2 pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile:1.3
--- pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile:1.2     Mon Dec 18 23:31:20 2017
+++ pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile Sun Feb 18 16:25:45 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:20 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2018/02/18 16:25:45 jmcneill Exp $
 
-PKGREVISION=           1
+PKGREVISION=           2
 
 UBOOT_TARGET=          nanopi-neo2
 UBOOT_CONFIG=          nanopi_neo2_defconfig
@@ -12,9 +12,8 @@ PKG_DEFAULT_OPTIONS+= el1
 post-extract:
        ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
 
-BUILD_DEPENDS+=                arm-trusted-firmware-sun50iw1p1-[0-9]*:../../sysutils/arm-trusted-firmware-sun50iw1p1
-
 post-build:
        ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
 
+.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"

Index: pkgsrc/sysutils/u-boot-pine64/Makefile
diff -u pkgsrc/sysutils/u-boot-pine64/Makefile:1.2 pkgsrc/sysutils/u-boot-pine64/Makefile:1.3
--- pkgsrc/sysutils/u-boot-pine64/Makefile:1.2  Mon Dec 18 23:31:21 2017
+++ pkgsrc/sysutils/u-boot-pine64/Makefile      Sun Feb 18 16:25:45 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:21 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2018/02/18 16:25:45 jmcneill Exp $
 
-PKGREVISION=           2
+PKGREVISION=           3
 
 UBOOT_TARGET=          pine64
 UBOOT_CONFIG=          pine64_plus_defconfig
@@ -12,9 +12,8 @@ PKG_DEFAULT_OPTIONS+= el1
 post-extract:
        ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
 
-BUILD_DEPENDS+=                arm-trusted-firmware-sun50iw1p1-[0-9]*:../../sysutils/arm-trusted-firmware-sun50iw1p1
-
 post-build:
-       ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} u-boot-sunxi-with-spl.bin
 
+.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"

Index: pkgsrc/sysutils/u-boot-pinebook/Makefile
diff -u pkgsrc/sysutils/u-boot-pinebook/Makefile:1.3 pkgsrc/sysutils/u-boot-pinebook/Makefile:1.4
--- pkgsrc/sysutils/u-boot-pinebook/Makefile:1.3        Sun Feb 18 12:27:20 2018
+++ pkgsrc/sysutils/u-boot-pinebook/Makefile    Sun Feb 18 16:25:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/02/18 12:27:20 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/02/18 16:25:45 jmcneill Exp $
 
 UBOOT_VERSION=         2018.01
 UBOOT_TARGET=          pinebook
@@ -18,11 +18,10 @@ PKG_DEFAULT_OPTIONS+=       el1
 post-extract:
        ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
 
-BUILD_DEPENDS+=                arm-trusted-firmware-sun50iw1p1>=20180111:../../sysutils/arm-trusted-firmware-sun50iw1p1
-
 post-build:
        ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
 
+.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
 
 # Override U-Boot defaults

Added files:

Index: pkgsrc/sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk
diff -u /dev/null pkgsrc/sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk:1.1
--- /dev/null   Sun Feb 18 16:25:45 2018
+++ pkgsrc/sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk       Sun Feb 18 16:25:45 2018
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2018/02/18 16:25:45 jmcneill Exp $
+
+BUILDLINK_DEPMETHOD.arm-trusted-firmware-sun50iw1p1?=  build
+
+BUILDLINK_TREE+=       arm-trusted-firmware-sun50iw1p1
+
+.if !defined(ARM_TRUSTED_FIRMWARE_SUN50IW1P1_BUILDLINK3_MK)
+ARM_TRUSTED_FIRMWARE_SUN50IW1P1_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.arm-trusted-firmware-sun50iw1p1+=        arm-trusted-firmware-sun50iw1p1>=20180111
+BUILDLINK_PKGSRCDIR.arm-trusted-firmware-sun50iw1p1?=  ../../sysutils/arm-trusted-firmware-sun50iw1p1
+.endif # ARM_TRUSTED_FIRMWARE_SUN50IW1P1_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -arm-trusted-firmware-sun50iw1p1