CVS commit: pkgsrc/sysutils/u-boot-bananapi-r2

["Jason R Thorpe" <thorpej%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thorpej
Date:           Thu Apr 25 13:22:12 UTC 2019

Modified Files:
        pkgsrc/sysutils/u-boot-bananapi-r2: Makefile PLIST

Log Message:
Install only the useful files, and install *all* of the useful files.
Bump version to 2019.04-rc4nb2.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/u-boot-bananapi-r2/Makefile \
    pkgsrc/sysutils/u-boot-bananapi-r2/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/u-boot-bananapi-r2/Makefile
diff -u pkgsrc/sysutils/u-boot-bananapi-r2/Makefile:1.2 pkgsrc/sysutils/u-boot-bananapi-r2/Makefile:1.3
--- pkgsrc/sysutils/u-boot-bananapi-r2/Makefile:1.2     Sun Mar 24 20:50:10 2019
+++ pkgsrc/sysutils/u-boot-bananapi-r2/Makefile Thu Apr 25 13:22:12 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2019/03/24 20:50:10 thorpej Exp $
+# $NetBSD: Makefile,v 1.3 2019/04/25 13:22:12 thorpej Exp $
 
 UBOOT_TARGET=          bananapi-r2
 UBOOT_CONFIG=          mt7623n_bpir2_defconfig
-UBOOT_BIN=             bpi-r2-sdmmc.img u-boot.bin u-boot-mtk.bin
+UBOOT_BIN=             bpi-r2-sdmmc.img u-boot.bin
 
-PKGREVISION=           1
+PKGREVISION=           2
 
 UBOOT_VERSION=         2019.04-rc4
 
@@ -15,16 +15,19 @@ DISTFILES=          ${DEFAULT_DISTFILES}
 # SDMMC_BOOT-signature
 SDMMC_BOOT_IMG=                BPI-R2-HEAD440-0k.img
 DISTFILES+=            ${SDMMC_BOOT_IMG}
+UBOOT_BIN+=            ${SDMMC_BOOT_IMG}
 SITES.${SDMMC_BOOT_IMG}=${MASTER_SITE_GITHUB:=BPI-SINOVOIP/BPI-R2-bsp/raw/v1.2.1/mt-pack/mtk/bpi-r2/bin/}
 
 # BRLYT-signature
 BRLYT_IMG=             BPI-R2-HEAD1-512b.img
 DISTFILES+=            ${BRLYT_IMG}
+UBOOT_BIN+=            ${BRLYT_IMG}
 SITES.${BRLYT_IMG}=    ${MASTER_SITE_GITHUB:=BPI-SINOVOIP/BPI-R2-bsp/raw/v1.2.1/mt-pack/mtk/bpi-r2/bin/}
 
 # Preloader
 PRELOADER_BIN=         preloader_iotg7623Np1_sd_1600M.bin
 DISTFILES+=            ${PRELOADER_BIN}
+UBOOT_BIN+=            ${PRELOADER_BIN}
 SITES.${PRELOADER_BIN}=        ${MASTER_SITE_GITHUB:=BPI-SINOVOIP/BPI-R2-bsp/raw/v1.2.1/mt-pack/mtk/bpi-r2/bin/}
 
 # pkgsrc tries to run distfiles that end in .bin; handle manually
@@ -32,19 +35,19 @@ EXTRACT_ONLY=               ${DISTFILES:N*.bin}
 
 post-extract:
        cp ${DISTDIR}/${SDMMC_BOOT_IMG} ${DISTDIR}/${BRLYT_IMG} \
-           ${DISTDIR}/${PRELOADER_BIN} ${WRKDIR}
+           ${DISTDIR}/${PRELOADER_BIN} ${WRKSRC}
 
 post-build:
 # Prepare an image that can be written to an SD card.  First is the
 # SDMMC_BOOT signature + address of second header (offset 0x200).
-       dd if=${WRKDIR}/${SDMMC_BOOT_IMG} of=${WRKSRC}/bpi-r2-sdmmc.img \
+       dd if=${WRKSRC}/${SDMMC_BOOT_IMG} of=${WRKSRC}/bpi-r2-sdmmc.img \
            bs=512 seek=0
 # Append the second header (BRLTY signature) + address of preloader
 # (offset 0x800).
-       dd if=${WRKDIR}/${BRLYT_IMG} of=${WRKSRC}/bpi-r2-sdmmc.img \
+       dd if=${WRKSRC}/${BRLYT_IMG} of=${WRKSRC}/bpi-r2-sdmmc.img \
            bs=512 seek=1
 # Append preloader.
-       dd if=${WRKDIR}/${PRELOADER_BIN} of=${WRKSRC}/bpi-r2-sdmmc.img \
+       dd if=${WRKSRC}/${PRELOADER_BIN} of=${WRKSRC}/bpi-r2-sdmmc.img \
            bs=1024 seek=2
 # Append U-boot image (offset 320KiB)
        dd if=${WRKSRC}/u-boot.bin of=${WRKSRC}/bpi-r2-sdmmc.img \
Index: pkgsrc/sysutils/u-boot-bananapi-r2/PLIST
diff -u pkgsrc/sysutils/u-boot-bananapi-r2/PLIST:1.2 pkgsrc/sysutils/u-boot-bananapi-r2/PLIST:1.3
--- pkgsrc/sysutils/u-boot-bananapi-r2/PLIST:1.2        Sun Mar 24 20:50:10 2019
+++ pkgsrc/sysutils/u-boot-bananapi-r2/PLIST    Thu Apr 25 13:22:12 2019
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2019/03/24 20:50:10 thorpej Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/04/25 13:22:12 thorpej Exp $
+share/u-boot/bananapi-r2/BPI-R2-HEAD440-0k.img
+share/u-boot/bananapi-r2/BPI-R2-HEAD1-512b.img
 share/u-boot/bananapi-r2/bpi-r2-sdmmc.img
+share/u-boot/bananapi-r2/preloader_iotg7623Np1_sd_1600M.bin
 share/u-boot/bananapi-r2/u-boot.bin
-share/u-boot/bananapi-r2/u-boot-mtk.bin