CVS commit: pkgsrc/sysutils/u-boot

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

Module Name:    pkgsrc
Committed By:   thorpej
Date:           Sat May 18 18:01:34 UTC 2019

Modified Files:
        pkgsrc/sysutils/u-boot: Makefile
Added Files:
        pkgsrc/sysutils/u-boot: options.mk

Log Message:
Make depending on u-boot for Meson-based boards optional, as they have
build-time dependencies not available on all platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/u-boot/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/u-boot/options.mk

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/Makefile
diff -u pkgsrc/sysutils/u-boot/Makefile:1.11 pkgsrc/sysutils/u-boot/Makefile:1.12
--- pkgsrc/sysutils/u-boot/Makefile:1.11        Tue May  7 14:05:36 2019
+++ pkgsrc/sysutils/u-boot/Makefile     Sat May 18 18:01:34 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2019/05/07 14:05:36 thorpej Exp $
+# $NetBSD: Makefile,v 1.12 2019/05/18 18:01:34 thorpej Exp $
 #
 
 .include "../../sysutils/u-boot/u-boot-version.mk"
 
 DISTNAME=      u-boot-${UBOOT_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    meta-pkgs sysutils u-boot
 MASTER_SITES=  # empty
 
@@ -12,6 +12,11 @@ MAINTAINER=  jmcneill%NetBSD.org@localhost
 HOMEPAGE=      https://www.denx.de/wiki/U-Boot
 COMMENT=       Das U-Boot, the Universal Boot Loader (meta-package)
 
+META_PACKAGE=  yes
+
+.include "options.mk"
+.include "../../mk/bsd.prefs.mk"
+
 DEPENDS+=      u-boot-a10-olinuxino-lime-[0-9]*:../../sysutils/u-boot-a10-olinuxino-lime
 DEPENDS+=      u-boot-bananapi-m3-[0-9]*:../../sysutils/u-boot-bananapi-m3
 DEPENDS+=      u-boot-bananapi-[0-9]*:../../sysutils/u-boot-bananapi
@@ -29,11 +34,16 @@ DEPENDS+=   u-boot-hummingbird-a31-[0-9]*:
 DEPENDS+=      u-boot-jetson-tk1-[0-9]*:../../sysutils/u-boot-jetson-tk1
 DEPENDS+=      u-boot-jetson-tx1-[0-9]*:../../sysutils/u-boot-jetson-tx1
 DEPENDS+=      u-boot-jetson-tx2-[0-9]*:../../sysutils/u-boot-jetson-tx2
+.if !empty(PKG_OPTIONS:Mamlogic-meson)
 DEPENDS+=      u-boot-libretech-cc-[0-9]*:../../sysutils/u-boot-libretech-cc
+.endif
 DEPENDS+=      u-boot-nanopi-m1-[0-9]*:../../sysutils/u-boot-nanopi-m1
 DEPENDS+=      u-boot-nanopi-neo-plus2-[0-9]*:../../sysutils/u-boot-nanopi-neo-plus2
 DEPENDS+=      u-boot-nanopi-neo-[0-9]*:../../sysutils/u-boot-nanopi-neo
 DEPENDS+=      u-boot-nanopi-neo2-[0-9]*:../../sysutils/u-boot-nanopi-neo2
+.if !empty(PKG_OPTIONS:Mamlogic-meson)
+DEPENDS+=      u-boot-odroid-c2-[0-9]*:../../sysutils/u-boot-odroid-c2
+.endif
 DEPENDS+=      u-boot-odroid-xu3-[0-9]*:../../sysutils/u-boot-odroid-xu3
 DEPENDS+=      u-boot-orangepi-2-[0-9]*:../../sysutils/u-boot-orangepi-2
 DEPENDS+=      u-boot-orangepi-one-[0-9]*:../../sysutils/u-boot-orangepi-one
@@ -46,6 +56,4 @@ DEPENDS+=     u-boot-pinebook-[0-9]*:../../s
 DEPENDS+=      u-boot-pocketchip-[0-9]*:../../sysutils/u-boot-pocketchip
 DEPENDS+=      u-boot-sopine-baseboard-[0-9]*:../../sysutils/u-boot-sopine-baseboard
 
-META_PACKAGE=  yes
-
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/sysutils/u-boot/options.mk
diff -u /dev/null pkgsrc/sysutils/u-boot/options.mk:1.1
--- /dev/null   Sat May 18 18:01:34 2019
+++ pkgsrc/sysutils/u-boot/options.mk   Sat May 18 18:01:34 2019
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2019/05/18 18:01:34 thorpej Exp $
+
+#
+# u-boot meta-package options:
+#
+# amlogic-meson:
+# Build u-boot for boards based on Amlogic Meson SoCs.  Disabled by
+# default because these u-boot packages require amlogic-meson-fwtools
+# to build.
+#
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.u-boot
+PKG_SUPPORTED_OPTIONS= amlogic-meson
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"