CVS commit: pkgsrc/sysutils

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Fri Jun 25 08:28:57 UTC 2021

Modified Files:
        pkgsrc/sysutils/u-boot: u-boot-rockchip.mk
        pkgsrc/sysutils/u-boot-pinebook-pro: Makefile
        pkgsrc/sysutils/u-boot-rock64: Makefile u-boot-rockchip.mk
        pkgsrc/sysutils/u-boot-rockpro64: Makefile
        pkgsrc/sysutils/u-boot-rockpro64-ayufan: Makefile

Log Message:
minor u-boot rockchip package cleanup.

rename U_BOOT_IMAGE_TYPE to UBOOT_IMAGE_TYPE -- matching the rest of pkgsrc.
remove not used (or needed) DISTINFO_FILE and PATCHDIR.

NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/u-boot-pinebook-pro/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/u-boot-rock64/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/u-boot-rock64/u-boot-rockchip.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/u-boot-rockpro64/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/u-boot-rockpro64-ayufan/Makefile

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.10 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.11
--- pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.10      Sun Apr 18 07:30:28 2021
+++ pkgsrc/sysutils/u-boot/u-boot-rockchip.mk   Fri Jun 25 08:28:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot-rockchip.mk,v 1.10 2021/04/18 07:30:28 mrg Exp $
+# $NetBSD: u-boot-rockchip.mk,v 1.11 2021/06/25 08:28:57 mrg Exp $
 #
 # should be used by sysutils/u-boot-rock64/Makefile
 # used by sysutils/u-boot-rockpro64/Makefile
@@ -8,12 +8,12 @@
 #
 # Set these variables:
 #
-#      U_BOOT_IMAGE_TYPE       ("rk3399", "rk3328")
+#      UBOOT_IMAGE_TYPE        ("rk3399", "rk3328")
 #
 
 UBOOT_VERSION?=                2020.01-rc5
 
-MAKE_ENV+=             BL31=${PREFIX}/share/arm-trusted-firmware/${U_BOOT_IMAGE_TYPE}/bl31.elf
+MAKE_ENV+=             BL31=${PREFIX}/share/arm-trusted-firmware/${UBOOT_IMAGE_TYPE}/bl31.elf
 
 post-build:
 # wrap everything up into a single file that can be written to an SD card
@@ -27,5 +27,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
 
-.include "../../sysutils/arm-trusted-firmware-${U_BOOT_IMAGE_TYPE}/buildlink3.mk"
+.include "../../sysutils/arm-trusted-firmware-${UBOOT_IMAGE_TYPE}/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"

Index: pkgsrc/sysutils/u-boot-pinebook-pro/Makefile
diff -u pkgsrc/sysutils/u-boot-pinebook-pro/Makefile:1.10 pkgsrc/sysutils/u-boot-pinebook-pro/Makefile:1.11
--- pkgsrc/sysutils/u-boot-pinebook-pro/Makefile:1.10   Sun Apr 18 08:54:56 2021
+++ pkgsrc/sysutils/u-boot-pinebook-pro/Makefile        Fri Jun 25 08:28:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/04/18 08:54:56 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2021/06/25 08:28:57 mrg Exp $
 
 PKGREVISION=           5
 
@@ -8,10 +8,6 @@ UBOOT_BIN=             idbloader.img rksd_loader.im
 
 UBOOT_INSTALLBOOT_PLIST=       installboot.plist
 
-U_BOOT_IMAGE_TYPE=     rk3399
-
-# Patches kept in pinebook-pro; first worked there.
-#DISTINFO_FILE=                ${.CURDIR}/../../sysutils/u-boot-pinebook-pro/distinfo
-#PATCHDIR=             ${.CURDIR}/../../sysutils/u-boot-pinebook-pro/patches
+UBOOT_IMAGE_TYPE=      rk3399
 
 .include "../../sysutils/u-boot/u-boot-rockchip.mk"

Index: pkgsrc/sysutils/u-boot-rock64/Makefile
diff -u pkgsrc/sysutils/u-boot-rock64/Makefile:1.9 pkgsrc/sysutils/u-boot-rock64/Makefile:1.10
--- pkgsrc/sysutils/u-boot-rock64/Makefile:1.9  Mon Apr 26 00:35:03 2021
+++ pkgsrc/sysutils/u-boot-rock64/Makefile      Fri Jun 25 08:28:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/04/26 00:35:03 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2021/06/25 08:28:57 mrg Exp $
 
 PKGREVISION=           7
 UBOOT_TARGET=          rock64
@@ -9,7 +9,7 @@ UBOOT_INSTALLBOOT_PLIST=        installboot.pli
 
 DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-rock64/distinfo
 
-U_BOOT_IMAGE_TYPE=     rk3328
+UBOOT_IMAGE_TYPE=      rk3328
 .include "../../sysutils/u-boot-rock64/u-boot-rockchip.mk"
 
 # Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware

Index: pkgsrc/sysutils/u-boot-rock64/u-boot-rockchip.mk
diff -u pkgsrc/sysutils/u-boot-rock64/u-boot-rockchip.mk:1.2 pkgsrc/sysutils/u-boot-rock64/u-boot-rockchip.mk:1.3
--- pkgsrc/sysutils/u-boot-rock64/u-boot-rockchip.mk:1.2        Mon Apr  6 15:06:17 2020
+++ pkgsrc/sysutils/u-boot-rock64/u-boot-rockchip.mk    Fri Jun 25 08:28:57 2021
@@ -1,4 +1,4 @@
-#      $NetBSD: u-boot-rockchip.mk,v 1.2 2020/04/06 15:06:17 tnn Exp $
+#      $NetBSD: u-boot-rockchip.mk,v 1.3 2021/06/25 08:28:57 mrg Exp $
 #
 # used by sysutils/u-boot-rock64/Makefile
 
@@ -6,7 +6,7 @@
 #
 # Set these variables:
 #
-#      U_BOOT_IMAGE_TYPE       ("rk3399", "rk3328")
+#      UBOOT_IMAGE_TYPE        ("rk3399", "rk3328")
 #
 
 UBOOT_VERSION= ${GITHUB_TAG:C/-.*$//}
@@ -31,7 +31,7 @@ post-build:
 # build stage 3 package
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} u-boot.itb
 # build stage 1 loader
-       ${WRKSRC}/tools/mkimage -n ${U_BOOT_IMAGE_TYPE} -T rksd -d ${WRKDIR}/${DDR_BIN} ${WRKSRC}/idbloader.img
+       ${WRKSRC}/tools/mkimage -n ${UBOOT_IMAGE_TYPE} -T rksd -d ${WRKDIR}/${DDR_BIN} ${WRKSRC}/idbloader.img
 # append stage2 loader
        cat ${WRKSRC}/spl/u-boot-spl.bin >> ${WRKSRC}/idbloader.img
 # wrap everything up into a single file that can be written to an SD card

Index: pkgsrc/sysutils/u-boot-rockpro64/Makefile
diff -u pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.11 pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.12
--- pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.11      Sun Apr 18 07:30:28 2021
+++ pkgsrc/sysutils/u-boot-rockpro64/Makefile   Fri Jun 25 08:28:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/04/18 07:30:28 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2021/06/25 08:28:57 mrg Exp $
 
 UBOOT_TARGET=          rockpro64
 UBOOT_CONFIG=          rockpro64-rk3399_defconfig
@@ -6,10 +6,6 @@ UBOOT_BIN=             idbloader.img rksd_loader.im
 
 UBOOT_INSTALLBOOT_PLIST=       installboot.plist
 
-U_BOOT_IMAGE_TYPE=     rk3399
-
-# Patches kept in pinebook-pro; first worked there.
-DISTINFO_FILE=         ${.CURDIR}/../../sysutils/u-boot-pinebook-pro/distinfo
-PATCHDIR=              ${.CURDIR}/../../sysutils/u-boot-pinebook-pro/patches
+UBOOT_IMAGE_TYPE=      rk3399
 
 .include "../../sysutils/u-boot/u-boot-rockchip.mk"

Index: pkgsrc/sysutils/u-boot-rockpro64-ayufan/Makefile
diff -u pkgsrc/sysutils/u-boot-rockpro64-ayufan/Makefile:1.3 pkgsrc/sysutils/u-boot-rockpro64-ayufan/Makefile:1.4
--- pkgsrc/sysutils/u-boot-rockpro64-ayufan/Makefile:1.3        Sun Apr 18 07:30:28 2021
+++ pkgsrc/sysutils/u-boot-rockpro64-ayufan/Makefile    Fri Jun 25 08:28:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/04/18 07:30:28 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2021/06/25 08:28:57 mrg Exp $
 
 UBOOT_TARGET=          rockpro64
 UBOOT_CONFIG=          rockpro64-rk3399_defconfig
@@ -6,10 +6,7 @@ UBOOT_BIN=             idbloader.img rksd_loader.im
 
 UBOOT_INSTALLBOOT_PLIST=       installboot.plist
 
-U_BOOT_IMAGE_TYPE=     rk3399
-
-DISTINFO_FILE=         ${.CURDIR}/../../sysutils/u-boot-rockpro64-ayufan/distinfo
-PATCHDIR=              ${.CURDIR}/../../sysutils/u-boot-rockpro64-ayufan/patches
+UBOOT_IMAGE_TYPE=      rk3399
 
 UBOOT_VERSION=  2020.01.2014
 MASTER_SITES=   ${MASTER_SITE_GITHUB:=ayufan-rock64/}