CVS commit: pkgsrc/sysutils

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Sat Dec 14 10:22:31 UTC 2019

Modified Files:
        pkgsrc/sysutils: Makefile
        pkgsrc/sysutils/u-boot: Makefile
Added Files:
        pkgsrc/sysutils/u-boot-rpi3-32: DESCR Makefile PLIST
Removed Files:
        pkgsrc/sysutils/u-boot-rpi3-32b: DESCR Makefile PLIST

Log Message:
sysutils/u-boot-rpi3-32: Use a directory of the right name

This fixes building sysutils/u-boot (the dependency on u-boot-rpi3-32b was
wrong as well).

Sorry for the short mishap.


To generate a diff of this commit:
cvs rdiff -u -r1.845 -r1.846 pkgsrc/sysutils/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/u-boot/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/u-boot-rpi3-32/DESCR \
    pkgsrc/sysutils/u-boot-rpi3-32/Makefile \
    pkgsrc/sysutils/u-boot-rpi3-32/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/u-boot-rpi3-32b/DESCR \
    pkgsrc/sysutils/u-boot-rpi3-32b/Makefile \
    pkgsrc/sysutils/u-boot-rpi3-32b/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/Makefile
diff -u pkgsrc/sysutils/Makefile:1.845 pkgsrc/sysutils/Makefile:1.846
--- pkgsrc/sysutils/Makefile:1.845      Sat Dec 14 01:12:28 2019
+++ pkgsrc/sysutils/Makefile    Sat Dec 14 10:22:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.845 2019/12/14 01:12:28 khorben Exp $
+# $NetBSD: Makefile,v 1.846 2019/12/14 10:22:30 khorben Exp $
 #
 
 COMMENT=       System utilities
@@ -668,7 +668,7 @@ SUBDIR+=    u-boot-pinebook
 SUBDIR+=       u-boot-pocketchip
 SUBDIR+=       u-boot-rock64
 SUBDIR+=       u-boot-rockpro64
-SUBDIR+=       u-boot-rpi3-32b
+SUBDIR+=       u-boot-rpi3-32
 SUBDIR+=       u-boot-sopine-baseboard
 SUBDIR+=       u-boot-tinker
 SUBDIR+=       u-boot-zynq-zybo-z7

Index: pkgsrc/sysutils/u-boot/Makefile
diff -u pkgsrc/sysutils/u-boot/Makefile:1.25 pkgsrc/sysutils/u-boot/Makefile:1.26
--- pkgsrc/sysutils/u-boot/Makefile:1.25        Sat Dec 14 02:21:26 2019
+++ pkgsrc/sysutils/u-boot/Makefile     Sat Dec 14 10:22:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/12/14 02:21:26 khorben Exp $
+# $NetBSD: Makefile,v 1.26 2019/12/14 10:22:30 khorben Exp $
 #
 
 .include "../../sysutils/u-boot/u-boot-version.mk"
@@ -65,7 +65,7 @@ DEPENDS+=     u-boot-pinebook-[0-9]*:../../s
 DEPENDS+=      u-boot-pocketchip-[0-9]*:../../sysutils/u-boot-pocketchip
 DEPENDS+=      u-boot-rock64-[0-9]*:../../sysutils/u-boot-rock64
 DEPENDS+=      u-boot-rockpro64-[0-9]*:../../sysutils/u-boot-rockpro64
-DEPENDS+=      u-boot-rpi3-32b-[0-9]*:../../sysutils/u-boot-rpi3-32b
+DEPENDS+=      u-boot-rpi3-32-[0-9]*:../../sysutils/u-boot-rpi3-32
 DEPENDS+=      u-boot-sopine-baseboard-[0-9]*:../../sysutils/u-boot-sopine-baseboard
 
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/sysutils/u-boot-rpi3-32/DESCR
diff -u /dev/null pkgsrc/sysutils/u-boot-rpi3-32/DESCR:1.1
--- /dev/null   Sat Dec 14 10:22:31 2019
+++ pkgsrc/sysutils/u-boot-rpi3-32/DESCR        Sat Dec 14 10:22:30 2019
@@ -0,0 +1,5 @@
+U-Boot is a bootloader for embedded boards based on PowerPC, ARM, MIPS and
+several other processors, which can be installed in a boot ROM and used to
+initialize and test the hardware or to download and run application code.
+
+This package provides U-Boot for the Raspberry Pi 3 (32-bits).
Index: pkgsrc/sysutils/u-boot-rpi3-32/Makefile
diff -u /dev/null pkgsrc/sysutils/u-boot-rpi3-32/Makefile:1.1
--- /dev/null   Sat Dec 14 10:22:31 2019
+++ pkgsrc/sysutils/u-boot-rpi3-32/Makefile     Sat Dec 14 10:22:30 2019
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2019/12/14 10:22:30 khorben Exp $
+
+UBOOT_TARGET=          rpi3-32
+UBOOT_CONFIG=          rpi_3_32b_defconfig
+UBOOT_BIN=             u-boot.bin
+
+.include "../../sysutils/u-boot/u-boot-arm.mk"
Index: pkgsrc/sysutils/u-boot-rpi3-32/PLIST
diff -u /dev/null pkgsrc/sysutils/u-boot-rpi3-32/PLIST:1.1
--- /dev/null   Sat Dec 14 10:22:31 2019
+++ pkgsrc/sysutils/u-boot-rpi3-32/PLIST        Sat Dec 14 10:22:30 2019
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2019/12/14 10:22:30 khorben Exp $
+share/u-boot/rpi3-32/u-boot.bin