CVS commit: pkgsrc/sysutils/u-boot

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jun  6 21:58:28 UTC 2018

Modified Files:
        pkgsrc/sysutils/u-boot: u-boot-arm.mk u-boot-arm64.mk u-boot.mk

Log Message:
u-boot: include bsd.pkg.mk later

Ideally, this should happen in the main Makefiles and not in
an included file like this one, but the change for that is too big
for me for now and this fixes u-boot-pine64.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot/u-boot-arm.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/u-boot/u-boot-arm64.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/u-boot/u-boot.mk

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-arm.mk
diff -u pkgsrc/sysutils/u-boot/u-boot-arm.mk:1.1 pkgsrc/sysutils/u-boot/u-boot-arm.mk:1.2
--- pkgsrc/sysutils/u-boot/u-boot-arm.mk:1.1    Sat Aug 12 14:23:43 2017
+++ pkgsrc/sysutils/u-boot/u-boot-arm.mk        Wed Jun  6 21:58:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot-arm.mk,v 1.1 2017/08/12 14:23:43 jmcneill Exp $
+# $NetBSD: u-boot-arm.mk,v 1.2 2018/06/06 21:58:28 wiz Exp $
 
 MAINTAINER=    port-arm%NetBSD.org@localhost
 BUILD_DEPENDS+=        cross-arm-none-eabi-gcc-[0-9]*:../../cross/arm-none-eabi-gcc
@@ -6,3 +6,4 @@ BUILD_DEPENDS+= cross-arm-none-eabi-gcc-
 UBOOT_ENV+=    CROSS_COMPILE=${PREFIX}/cross-arm-none-eabi/bin/arm-none-eabi-
 
 .include "u-boot.mk"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/u-boot/u-boot-arm64.mk
diff -u pkgsrc/sysutils/u-boot/u-boot-arm64.mk:1.2 pkgsrc/sysutils/u-boot/u-boot-arm64.mk:1.3
--- pkgsrc/sysutils/u-boot/u-boot-arm64.mk:1.2  Thu Sep  7 15:30:31 2017
+++ pkgsrc/sysutils/u-boot/u-boot-arm64.mk      Wed Jun  6 21:58:28 2018
@@ -1,10 +1,12 @@
-# $NetBSD: u-boot-arm64.mk,v 1.2 2017/09/07 15:30:31 jmcneill Exp $
+# $NetBSD: u-boot-arm64.mk,v 1.3 2018/06/06 21:58:28 wiz Exp $
 
 MAINTAINER=    port-arm%NetBSD.org@localhost
 BUILD_DEPENDS+=        cross-aarch64-none-elf-gcc-[0-9]*:../../cross/aarch64-none-elf-gcc
 
 UBOOT_ENV+=    CROSS_COMPILE=${PREFIX}/cross-aarch64-none-elf/bin/aarch64-none-elf-
 
+.include "u-boot.mk"
+
 PKG_OPTIONS_VAR=       PKG_OPTIONS.u-boot-${UBOOT_TARGET}
 PKG_SUPPORTED_OPTIONS= el1
 
@@ -14,4 +16,4 @@ PKG_SUPPORTED_OPTIONS=        el1
 UBOOT_OPTIONS+=        CONFIG_ARMV8_SWITCH_TO_EL1=y
 .endif
 
-.include "u-boot.mk"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/u-boot/u-boot.mk
diff -u pkgsrc/sysutils/u-boot/u-boot.mk:1.10 pkgsrc/sysutils/u-boot/u-boot.mk:1.11
--- pkgsrc/sysutils/u-boot/u-boot.mk:1.10       Thu May 31 20:25:15 2018
+++ pkgsrc/sysutils/u-boot/u-boot.mk    Wed Jun  6 21:58:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot.mk,v 1.10 2018/05/31 20:25:15 wiz Exp $
+# $NetBSD: u-boot.mk,v 1.11 2018/06/06 21:58:28 wiz Exp $
 
 .include "../../sysutils/u-boot/u-boot-version.mk"
 
@@ -53,4 +53,3 @@ do-install:
 .endfor
 
 .include "../../lang/python/tool.mk"
-.include "../../mk/bsd.pkg.mk"