CVS commit: pkgsrc/sysutils

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu May 31 20:25:16 UTC 2018

Modified Files:
        pkgsrc/sysutils/u-boot: u-boot.mk
        pkgsrc/sysutils/u-boot-pine-h64: Makefile
        pkgsrc/sysutils/u-boot-pinebook: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/u-boot/u-boot.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot-pine-h64/Makefile
cvs rdiff -u -r1.5 -r1.6 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/u-boot.mk
diff -u pkgsrc/sysutils/u-boot/u-boot.mk:1.9 pkgsrc/sysutils/u-boot/u-boot.mk:1.10
--- pkgsrc/sysutils/u-boot/u-boot.mk:1.9        Thu May 24 22:35:56 2018
+++ pkgsrc/sysutils/u-boot/u-boot.mk    Thu May 31 20:25:15 2018
@@ -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 @@ DISTNAME?=      u-boot-${UBOOT_VERSION}
 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/

Index: pkgsrc/sysutils/u-boot-pine-h64/Makefile
diff -u pkgsrc/sysutils/u-boot-pine-h64/Makefile:1.1 pkgsrc/sysutils/u-boot-pine-h64/Makefile:1.2
--- pkgsrc/sysutils/u-boot-pine-h64/Makefile:1.1        Sat May 26 17:53:18 2018
+++ pkgsrc/sysutils/u-boot-pine-h64/Makefile    Thu May 31 20:25:15 2018
@@ -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-extract:
 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

Index: pkgsrc/sysutils/u-boot-pinebook/Makefile
diff -u pkgsrc/sysutils/u-boot-pinebook/Makefile:1.5 pkgsrc/sysutils/u-boot-pinebook/Makefile:1.6
--- pkgsrc/sysutils/u-boot-pinebook/Makefile:1.5        Fri May 25 10:45:24 2018
+++ pkgsrc/sysutils/u-boot-pinebook/Makefile    Thu May 31 20:25:16 2018
@@ -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 @@ GITHUB_TAG=           01c860679dabd8ac37bd0eccc90
 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 @@ post-build:
 
 .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