[pkgsrc/trunk]: pkgsrc/sysutils u-boot*: Improve u-boot variables so they con...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2881cf758bab
branches:  trunk
changeset: 381196:2881cf758bab
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu May 31 20:25:15 2018 +0000

description:
u-boot*: Improve u-boot variables so they confuse pkglint less.

diffstat:

 sysutils/u-boot-pine-h64/Makefile |  9 ++++-----
 sysutils/u-boot-pinebook/Makefile |  9 ++++-----
 sysutils/u-boot/u-boot.mk         |  4 ++--
 3 files changed, 10 insertions(+), 12 deletions(-)

diffs (67 lines):

diff -r 93bbbd8fdae3 -r 2881cf758bab sysutils/u-boot-pine-h64/Makefile
--- a/sysutils/u-boot-pine-h64/Makefile Thu May 31 20:20:00 2018 +0000
+++ b/sysutils/u-boot-pine-h64/Makefile Thu May 31 20:25:15 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/05/26 17:53:18 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/31 20:25:15 wiz Exp $
 
 UBOOT_VERSION=         2018.03rc1
 UBOOT_TARGET=          pine-h64
@@ -18,9 +18,8 @@
 post-build:
        ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
 
+DISTINFO_FILE=         ${.CURDIR}/../../sysutils/u-boot-pine-h64/distinfo
+PATCHDIR=              ${.CURDIR}/../../sysutils/u-boot-pine-h64/patches
+
 .include "../../sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
-
-# Override U-Boot defaults
-DISTINFO_FILE=         ${.CURDIR}/distinfo
-PATCHDIR=              ${.CURDIR}/patches
diff -r 93bbbd8fdae3 -r 2881cf758bab sysutils/u-boot-pinebook/Makefile
--- a/sysutils/u-boot-pinebook/Makefile Thu May 31 20:20:00 2018 +0000
+++ b/sysutils/u-boot-pinebook/Makefile Thu May 31 20:25:15 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/05/25 10:45:24 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2018/05/31 20:25:16 wiz Exp $
 
 UBOOT_VERSION=         2018.05
 UBOOT_TARGET=          pinebook
@@ -12,6 +12,9 @@
 DISTNAME=              u-boot-${UBOOT_TARGET}-${UBOOT_VERSION}
 EXTRACT_SUFX=          .tar.gz
 
+DISTINFO_FILE=         ${.CURDIR}/../../sysutils/u-boot-pinebook/distinfo
+PATCHDIR=              ${.CURDIR}/../../sysutils/u-boot-pinebook/patches
+
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=  el1
 
@@ -23,7 +26,3 @@
 
 .include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
-
-# Override U-Boot defaults
-DISTINFO_FILE=         ${.CURDIR}/distinfo
-PATCHDIR=              ${.CURDIR}/patches
diff -r 93bbbd8fdae3 -r 2881cf758bab sysutils/u-boot/u-boot.mk
--- a/sysutils/u-boot/u-boot.mk Thu May 31 20:20:00 2018 +0000
+++ b/sysutils/u-boot/u-boot.mk Thu May 31 20:25:15 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot.mk,v 1.9 2018/05/24 22:35:56 jmcneill Exp $
+# $NetBSD: u-boot.mk,v 1.10 2018/05/31 20:25:15 wiz Exp $
 
 .include "../../sysutils/u-boot/u-boot-version.mk"
 
@@ -7,7 +7,7 @@
 DISTINFO_FILE?=        ${.CURDIR}/../../sysutils/u-boot/distinfo
 CATEGORIES=    sysutils
 EXTRACT_SUFX?= .tar.bz2
-PATCHDIR=      ${.CURDIR}/../../sysutils/u-boot/patches
+PATCHDIR?=     ${.CURDIR}/../../sysutils/u-boot/patches
 
 HOMEPAGE?=     https://www.denx.de/wiki/U-Boot
 MASTER_SITES?= ftp://ftp.denx.de/pub/u-boot/