CVS commit: pkgsrc/sysutils/u-boot

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat May 23 09:39:06 UTC 2020

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

Log Message:
sysutils/u-boot: remove unnecessary interpreter patches

There was a typo in the python3 interpreter since it defined python2
instead of the correct python3.

All files from the python2 block use python3 nowadays, therefore that
whole block is unnecessary as well.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk
cvs rdiff -u -r1.24 -r1.25 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.7 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.8
--- pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.7       Tue May 19 20:02:51 2020
+++ pkgsrc/sysutils/u-boot/u-boot-rockchip.mk   Sat May 23 09:39:06 2020
@@ -1,4 +1,4 @@
-#      $NetBSD: u-boot-rockchip.mk,v 1.7 2020/05/19 20:02:51 rillig Exp $
+# $NetBSD: u-boot-rockchip.mk,v 1.8 2020/05/23 09:39:06 rillig Exp $
 #
 # should be used by sysutils/u-boot-rock64/Makefile
 # used by sysutils/u-boot-rockpro64/Makefile
@@ -32,10 +32,6 @@ post-build:
        dd if=${WRKSRC}/u-boot.itb seek=1024 conv=notrunc of=${WRKSRC}/rkspi_loader.img
 
 PYTHON_VERSIONS_ACCEPTED+=     37 38
-REPLACE_INTERPRETER+=  python3
-REPLACE.python3.old=   python3
-REPLACE.python3.new=   ${PYTHON3BIN}
-REPLACE_FILES.python2= arch/arm/mach-rockchip/make_fit_atf.py
 
 .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.24 pkgsrc/sysutils/u-boot/u-boot.mk:1.25
--- pkgsrc/sysutils/u-boot/u-boot.mk:1.24       Tue May 12 16:20:47 2020
+++ pkgsrc/sysutils/u-boot/u-boot.mk    Sat May 23 09:39:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot.mk,v 1.24 2020/05/12 16:20:47 rillig Exp $
+# $NetBSD: u-boot.mk,v 1.25 2020/05/23 09:39:06 rillig Exp $
 
 .include "../../sysutils/u-boot/u-boot-version.mk"
 
@@ -25,16 +25,6 @@ ALL_ENV+=            PYTHON2=${PYTHONBIN} PYTHONC
 ALL_ENV+=              PYTHONLIBPATH=-L$(LOCALBASE)/lib
 PYTHON_VERSIONS_ACCEPTED=      27
 
-REPLACE_INTERPRETER+=  python2
-REPLACE.python2.old=   python2
-REPLACE.python2.new=   ${PYTHONBIN}
-REPLACE_FILES.python2= scripts/fill_scrapyard.py \
-                       tools/binman/binman \
-                       tools/binman/binman.py \
-                       tools/dtoc/dtoc.py \
-                       tools/genboardscfg.py \
-                       tools/moveconfig.py
-
 .if defined(PKGREVISION) && !empty(PKGREVISION) && (${PKGREVISION} != "0")
 UBOOT_ENV+=    UBOOT_PKGREVISION=nb${PKGREVISION}
 .endif