CVS commit: pkgsrc/sysutils/u-boot

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Jun 13 07:01:32 UTC 2020

Modified Files:
        pkgsrc/sysutils/u-boot: u-boot-rockchip.mk u-boot.mk

Log Message:
u-boot: depend on python as a tool

fixes error when running arch/arm/mach-rockchip/make_fit_atf.py


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk
cvs rdiff -u -r1.25 -r1.26 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-rockchip.mk
diff -u pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.8 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.9
--- pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.8       Sat May 23 09:39:06 2020
+++ pkgsrc/sysutils/u-boot/u-boot-rockchip.mk   Sat Jun 13 07:01:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot-rockchip.mk,v 1.8 2020/05/23 09:39:06 rillig Exp $
+# $NetBSD: u-boot-rockchip.mk,v 1.9 2020/06/13 07:01:32 tnn Exp $
 #
 # should be used by sysutils/u-boot-rock64/Makefile
 # used by sysutils/u-boot-rockpro64/Makefile
@@ -31,7 +31,5 @@ post-build:
        done < ${WRKSRC}/idbloader.img > ${WRKSRC}/rkspi_loader.img 2> /dev/null
        dd if=${WRKSRC}/u-boot.itb seek=1024 conv=notrunc of=${WRKSRC}/rkspi_loader.img
 
-PYTHON_VERSIONS_ACCEPTED+=     37 38
-
 .include "../../sysutils/arm-trusted-firmware-${U_BOOT_IMAGE_TYPE}/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"

Index: pkgsrc/sysutils/u-boot/u-boot.mk
diff -u pkgsrc/sysutils/u-boot/u-boot.mk:1.25 pkgsrc/sysutils/u-boot/u-boot.mk:1.26
--- pkgsrc/sysutils/u-boot/u-boot.mk:1.25       Sat May 23 09:39:06 2020
+++ pkgsrc/sysutils/u-boot/u-boot.mk    Sat Jun 13 07:01:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot.mk,v 1.25 2020/05/23 09:39:06 rillig Exp $
+# $NetBSD: u-boot.mk,v 1.26 2020/06/13 07:01:32 tnn Exp $
 
 .include "../../sysutils/u-boot/u-boot-version.mk"
 
@@ -20,10 +20,11 @@ LICENSE=    gnu-gpl-v2
 
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            bison gmake gsed pkg-config gawk
-PYTHON_FOR_BUILD_ONLY= yes
+PYTHON_FOR_BUILD_ONLY= tool
 ALL_ENV+=              PYTHON2=${PYTHONBIN} PYTHONCONFIG=${PYTHONCONFIG}
 ALL_ENV+=              PYTHONLIBPATH=-L$(LOCALBASE)/lib
 PYTHON_VERSIONS_ACCEPTED=      27
+.include "../../lang/python/tool.mk"
 
 .if defined(PKGREVISION) && !empty(PKGREVISION) && (${PKGREVISION} != "0")
 UBOOT_ENV+=    UBOOT_PKGREVISION=nb${PKGREVISION}
@@ -53,5 +54,3 @@ do-install:
        ${INSTALL_DATA} ${.CURDIR}/files/${UBOOT_INSTALLBOOT_PLIST} \
            ${DESTDIR}${PREFIX}/share/u-boot/${UBOOT_TARGET}/installboot.plist
 .endif
-
-.include "../../lang/python/tool.mk"