[pkgsrc/trunk]: pkgsrc/sysutils/u-boot Provide enough rope to allow individua...

[martin <martin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/865b5b613bfe
branches:  trunk
changeset: 448552:865b5b613bfe
user:      martin <martin%pkgsrc.org@localhost>
date:      Tue Mar 09 16:49:12 2021 +0000

description:
Provide enough rope to allow individual u-boot pkgs to request a different
version. This allows for incremental updates and tests.

diffstat:

 sysutils/u-boot/distinfo-2021.01  |   6 ++++++
 sysutils/u-boot/u-boot-version.mk |  13 +++++++++++--
 sysutils/u-boot/u-boot.mk         |   3 +--
 3 files changed, 18 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r c1f5c3d26f43 -r 865b5b613bfe sysutils/u-boot/distinfo-2021.01
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/u-boot/distinfo-2021.01  Tue Mar 09 16:49:12 2021 +0000
@@ -0,0 +1,6 @@
+$NetBSD: distinfo-2021.01,v 1.1 2021/03/09 16:49:12 martin Exp $
+
+SHA1 (u-boot-2021.01.tar.bz2) = af6228e71419c29bb0192631bc8868e211941f9d
+RMD160 (u-boot-2021.01.tar.bz2) = 2a2e5906f9ea5947025e948bd34acb03488e87de
+SHA512 (u-boot-2021.01.tar.bz2) = 40dd4d9ef87a1829158658c433d46a047a39c0d8c314ad8d133f7240343ee3a75b060f009dd2efe598cfb8a766773f6cd773ea7f7745ee88e52a771c77eb1c6e
+Size (u-boot-2021.01.tar.bz2) = 16375990 bytes
diff -r c1f5c3d26f43 -r 865b5b613bfe sysutils/u-boot/u-boot-version.mk
--- a/sysutils/u-boot/u-boot-version.mk Tue Mar 09 15:11:29 2021 +0000
+++ b/sysutils/u-boot/u-boot-version.mk Tue Mar 09 16:49:12 2021 +0000
@@ -1,3 +1,12 @@
-# $NetBSD: u-boot-version.mk,v 1.3 2018/12/14 00:52:26 jmcneill Exp $
+# $NetBSD: u-boot-version.mk,v 1.4 2021/03/09 16:49:12 martin Exp $
+
+UBOOT_DEFAULT_VERSION= 2018.11
+
+UBOOT_VERSION?=        ${UBOOT_DEFAULT_VERSION}
 
-UBOOT_VERSION?=        2018.11
+.if ${UBOOT_VERSION} != ${UBOOT_DEFAULT_VERSION}
+DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot/distinfo-${UBOOT_VERSION}
+PATCHDIR=      ${.CURDIR}/../../sysutils/u-boot/patches-${UBOOT_VERSION}
+.else
+PATCHDIR?=     ${.CURDIR}/../../sysutils/u-boot/patches
+.endif
diff -r c1f5c3d26f43 -r 865b5b613bfe sysutils/u-boot/u-boot.mk
--- a/sysutils/u-boot/u-boot.mk Tue Mar 09 15:11:29 2021 +0000
+++ b/sysutils/u-boot/u-boot.mk Tue Mar 09 16:49:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot.mk,v 1.30 2021/03/06 15:52:55 jmcneill Exp $
+# $NetBSD: u-boot.mk,v 1.31 2021/03/09 16:49:12 martin Exp $
 
 .include "../../sysutils/u-boot/u-boot-version.mk"
 
@@ -7,7 +7,6 @@
 DISTINFO_FILE?=        ${.CURDIR}/../../sysutils/u-boot/distinfo
 CATEGORIES=    sysutils
 EXTRACT_SUFX?= .tar.bz2
-PATCHDIR?=     ${.CURDIR}/../../sysutils/u-boot/patches
 
 HOMEPAGE?=     https://www.denx.de/wiki/U-Boot
 MASTER_SITES?= ftp://ftp.denx.de/pub/u-boot/