Sat Jun 13 07:01:32 2020 UTC ()
u-boot: depend on python as a tool

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


(tnn)
diff -r1.8 -r1.9 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk
diff -r1.25 -r1.26 pkgsrc/sysutils/u-boot/u-boot.mk
cvs diff -r1.8 -r1.9 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/u-boot-rockchip.mk 2020/05/23 09:39:06 1.8
+++ pkgsrc/sysutils/u-boot/u-boot-rockchip.mk 2020/06/13 07:01:32 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: u-boot-rockchip.mk,v 1.8 2020/05/23 09:39:06 rillig Exp $ 1# $NetBSD: u-boot-rockchip.mk,v 1.9 2020/06/13 07:01:32 tnn Exp $
2# 2#
3# should be used by sysutils/u-boot-rock64/Makefile 3# should be used by sysutils/u-boot-rock64/Makefile
4# used by sysutils/u-boot-rockpro64/Makefile 4# used by sysutils/u-boot-rockpro64/Makefile
5# used by sysutils/u-boot-pinebook-pro/Makefile 5# used by sysutils/u-boot-pinebook-pro/Makefile
6 6
7# Common makefile fragment for rockchip based u-boot targets. 7# Common makefile fragment for rockchip based u-boot targets.
8# 8#
9# Set these variables: 9# Set these variables:
10# 10#
11# U_BOOT_IMAGE_TYPE ("rk3399", "rk3328") 11# U_BOOT_IMAGE_TYPE ("rk3399", "rk3328")
12# 12#
13 13
14UBOOT_VERSION?= 2020.01-rc5 14UBOOT_VERSION?= 2020.01-rc5
@@ -21,17 +21,15 @@ MAKE_ENV+= BL31=${PREFIX}/share/arm-tru @@ -21,17 +21,15 @@ MAKE_ENV+= BL31=${PREFIX}/share/arm-tru
21 21
22post-build: 22post-build:
23# wrap everything up into a single file that can be written to an SD card 23# wrap everything up into a single file that can be written to an SD card
24 cp ${WRKSRC}/idbloader.img ${WRKSRC}/rksd_loader.img 24 cp ${WRKSRC}/idbloader.img ${WRKSRC}/rksd_loader.img
25 dd if=${WRKSRC}/u-boot.itb seek=448 conv=notrunc of=${WRKSRC}/rksd_loader.img 25 dd if=${WRKSRC}/u-boot.itb seek=448 conv=notrunc of=${WRKSRC}/rksd_loader.img
26# build SPI NOR flash image. See dev-ayufan/build.mk. 26# build SPI NOR flash image. See dev-ayufan/build.mk.
27 set -e; b=0; while [ "$$b" != 128 ]; do \ 27 set -e; b=0; while [ "$$b" != 128 ]; do \
28 dd bs=2k count=1; \ 28 dd bs=2k count=1; \
29 dd if=/dev/zero bs=2k count=1; \ 29 dd if=/dev/zero bs=2k count=1; \
30 b=$$(expr $$b + 1); \ 30 b=$$(expr $$b + 1); \
31 done < ${WRKSRC}/idbloader.img > ${WRKSRC}/rkspi_loader.img 2> /dev/null 31 done < ${WRKSRC}/idbloader.img > ${WRKSRC}/rkspi_loader.img 2> /dev/null
32 dd if=${WRKSRC}/u-boot.itb seek=1024 conv=notrunc of=${WRKSRC}/rkspi_loader.img 32 dd if=${WRKSRC}/u-boot.itb seek=1024 conv=notrunc of=${WRKSRC}/rkspi_loader.img
33 33
34PYTHON_VERSIONS_ACCEPTED+= 37 38 
35 
36.include "../../sysutils/arm-trusted-firmware-${U_BOOT_IMAGE_TYPE}/buildlink3.mk" 34.include "../../sysutils/arm-trusted-firmware-${U_BOOT_IMAGE_TYPE}/buildlink3.mk"
37.include "../../sysutils/u-boot/u-boot-arm64.mk" 35.include "../../sysutils/u-boot/u-boot-arm64.mk"
cvs diff -r1.25 -r1.26 pkgsrc/sysutils/u-boot/u-boot.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/u-boot.mk 2020/05/23 09:39:06 1.25
+++ pkgsrc/sysutils/u-boot/u-boot.mk 2020/06/13 07:01:32 1.26
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1# $NetBSD: u-boot.mk,v 1.25 2020/05/23 09:39:06 rillig Exp $ 1# $NetBSD: u-boot.mk,v 1.26 2020/06/13 07:01:32 tnn Exp $
2 2
3.include "../../sysutils/u-boot/u-boot-version.mk" 3.include "../../sysutils/u-boot/u-boot-version.mk"
4 4
5PKGNAME?= u-boot-${UBOOT_TARGET}-${UBOOT_VERSION:S/-/./} 5PKGNAME?= u-boot-${UBOOT_TARGET}-${UBOOT_VERSION:S/-/./}
6DISTNAME?= u-boot-${UBOOT_VERSION} 6DISTNAME?= u-boot-${UBOOT_VERSION}
7DISTINFO_FILE?= ${.CURDIR}/../../sysutils/u-boot/distinfo 7DISTINFO_FILE?= ${.CURDIR}/../../sysutils/u-boot/distinfo
8CATEGORIES= sysutils 8CATEGORIES= sysutils
9EXTRACT_SUFX?= .tar.bz2 9EXTRACT_SUFX?= .tar.bz2
10PATCHDIR?= ${.CURDIR}/../../sysutils/u-boot/patches 10PATCHDIR?= ${.CURDIR}/../../sysutils/u-boot/patches
11 11
12HOMEPAGE?= https://www.denx.de/wiki/U-Boot 12HOMEPAGE?= https://www.denx.de/wiki/U-Boot
13MASTER_SITES?= ftp://ftp.denx.de/pub/u-boot/ 13MASTER_SITES?= ftp://ftp.denx.de/pub/u-boot/
14 14
15TOOL_DEPENDS+= dtc>=1.4.2:../../sysutils/dtc 15TOOL_DEPENDS+= dtc>=1.4.2:../../sysutils/dtc
16TOOL_DEPENDS+= swig>=1.3:../../devel/swig 16TOOL_DEPENDS+= swig>=1.3:../../devel/swig
17 17
18COMMENT= Das U-Boot, the Universal Boot Loader (${UBOOT_CONFIG}) 18COMMENT= Das U-Boot, the Universal Boot Loader (${UBOOT_CONFIG})
19LICENSE= gnu-gpl-v2 19LICENSE= gnu-gpl-v2
20 20
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22USE_TOOLS+= bison gmake gsed pkg-config gawk 22USE_TOOLS+= bison gmake gsed pkg-config gawk
23PYTHON_FOR_BUILD_ONLY= yes 23PYTHON_FOR_BUILD_ONLY= tool
24ALL_ENV+= PYTHON2=${PYTHONBIN} PYTHONCONFIG=${PYTHONCONFIG} 24ALL_ENV+= PYTHON2=${PYTHONBIN} PYTHONCONFIG=${PYTHONCONFIG}
25ALL_ENV+= PYTHONLIBPATH=-L$(LOCALBASE)/lib 25ALL_ENV+= PYTHONLIBPATH=-L$(LOCALBASE)/lib
26PYTHON_VERSIONS_ACCEPTED= 27 26PYTHON_VERSIONS_ACCEPTED= 27
 27.include "../../lang/python/tool.mk"
27 28
28.if defined(PKGREVISION) && !empty(PKGREVISION) && (${PKGREVISION} != "0") 29.if defined(PKGREVISION) && !empty(PKGREVISION) && (${PKGREVISION} != "0")
29UBOOT_ENV+= UBOOT_PKGREVISION=nb${PKGREVISION} 30UBOOT_ENV+= UBOOT_PKGREVISION=nb${PKGREVISION}
30.endif 31.endif
31 32
32MAKE_ENV+= ${UBOOT_ENV} 33MAKE_ENV+= ${UBOOT_ENV}
33 34
34post-patch: 35post-patch:
35.for opt in ${UBOOT_OPTIONS} 36.for opt in ${UBOOT_OPTIONS}
36 @echo "=> Adding ${opt} to configs/${UBOOT_CONFIG}" 37 @echo "=> Adding ${opt} to configs/${UBOOT_CONFIG}"
37 @echo ${opt} >> ${WRKSRC}/configs/${UBOOT_CONFIG} 38 @echo ${opt} >> ${WRKSRC}/configs/${UBOOT_CONFIG}
38.endfor 39.endfor
39 40
@@ -43,15 +44,13 @@ do-configure: @@ -43,15 +44,13 @@ do-configure:
43do-build: 44do-build:
44 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${_MAKE_JOBS} 45 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${_MAKE_JOBS}
45 46
46do-install: 47do-install:
47 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/u-boot/${UBOOT_TARGET} 48 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/u-boot/${UBOOT_TARGET}
48.for bin in ${UBOOT_BIN} 49.for bin in ${UBOOT_BIN}
49 ${INSTALL_DATA} ${WRKSRC}/${bin} \ 50 ${INSTALL_DATA} ${WRKSRC}/${bin} \
50 ${DESTDIR}${PREFIX}/share/u-boot/${UBOOT_TARGET} 51 ${DESTDIR}${PREFIX}/share/u-boot/${UBOOT_TARGET}
51.endfor 52.endfor
52.if defined(UBOOT_INSTALLBOOT_PLIST) 53.if defined(UBOOT_INSTALLBOOT_PLIST)
53 ${INSTALL_DATA} ${.CURDIR}/files/${UBOOT_INSTALLBOOT_PLIST} \ 54 ${INSTALL_DATA} ${.CURDIR}/files/${UBOOT_INSTALLBOOT_PLIST} \
54 ${DESTDIR}${PREFIX}/share/u-boot/${UBOOT_TARGET}/installboot.plist 55 ${DESTDIR}${PREFIX}/share/u-boot/${UBOOT_TARGET}/installboot.plist
55.endif 56.endif
56 
57.include "../../lang/python/tool.mk"