pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/u-boot u-boot: include bsd.pkg.mk later
details: https://anonhg.NetBSD.org/pkgsrc/rev/041e5b9f51ba
branches: trunk
changeset: 309015:041e5b9f51ba
user: wiz <wiz%pkgsrc.org@localhost>
date: Wed Jun 06 21:58:28 2018 +0000
description:
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.
diffstat:
sysutils/u-boot/u-boot-arm.mk | 3 ++-
sysutils/u-boot/u-boot-arm64.mk | 6 ++++--
sysutils/u-boot/u-boot.mk | 3 +--
3 files changed, 7 insertions(+), 5 deletions(-)
diffs (51 lines):
diff -r 2cbbe4fc6096 -r 041e5b9f51ba sysutils/u-boot/u-boot-arm.mk
--- a/sysutils/u-boot/u-boot-arm.mk Wed Jun 06 19:28:19 2018 +0000
+++ b/sysutils/u-boot/u-boot-arm.mk Wed Jun 06 21:58:28 2018 +0000
@@ -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 @@
UBOOT_ENV+= CROSS_COMPILE=${PREFIX}/cross-arm-none-eabi/bin/arm-none-eabi-
.include "u-boot.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 2cbbe4fc6096 -r 041e5b9f51ba sysutils/u-boot/u-boot-arm64.mk
--- a/sysutils/u-boot/u-boot-arm64.mk Wed Jun 06 19:28:19 2018 +0000
+++ b/sysutils/u-boot/u-boot-arm64.mk Wed Jun 06 21:58:28 2018 +0000
@@ -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 @@
UBOOT_OPTIONS+= CONFIG_ARMV8_SWITCH_TO_EL1=y
.endif
-.include "u-boot.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 2cbbe4fc6096 -r 041e5b9f51ba sysutils/u-boot/u-boot.mk
--- a/sysutils/u-boot/u-boot.mk Wed Jun 06 19:28:19 2018 +0000
+++ b/sysutils/u-boot/u-boot.mk Wed Jun 06 21:58:28 2018 +0000
@@ -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 @@
.endfor
.include "../../lang/python/tool.mk"
-.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index