diff options
| author | rillig <rillig@pkgsrc.org> | 2020-05-23 09:39:06 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2020-05-23 09:39:06 +0000 |
| commit | c6bdd8d3aab7d72b805ee65279322ca219de297c (patch) | |
| tree | bb9f4ce0abed2212981bb71c7b119112fc636e43 /sysutils/u-boot | |
| parent | a9a63661d11a4406128904b561bfa09dba9f69cd (diff) | |
| download | pkgsrc-c6bdd8d3aab7d72b805ee65279322ca219de297c.tar.gz | |
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.
Diffstat (limited to 'sysutils/u-boot')
| -rw-r--r-- | sysutils/u-boot/u-boot-rockchip.mk | 6 | ||||
| -rw-r--r-- | sysutils/u-boot/u-boot.mk | 12 |
2 files changed, 2 insertions, 16 deletions
diff --git a/sysutils/u-boot/u-boot-rockchip.mk b/sysutils/u-boot/u-boot-rockchip.mk index 959126a4edc..a2105ee61d1 100644 --- a/sysutils/u-boot/u-boot-rockchip.mk +++ b/sysutils/u-boot/u-boot-rockchip.mk @@ -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" diff --git a/sysutils/u-boot/u-boot.mk b/sysutils/u-boot/u-boot.mk index 4475063faef..06149de8666 100644 --- a/sysutils/u-boot/u-boot.mk +++ b/sysutils/u-boot/u-boot.mk @@ -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} PYTHONCONFIG=${PYTHONCONFIG} 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 |