From 8185e2007bd46d536cd87b169bc92b428c640d3f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 24 Oct 2016 17:13:50 +0200
Subject: [PATCH] pkg: exclude missing packages on armv6

---
 Makefile       | 9 +++++----
 Mk/defaults.mk | 1 +
 README.md      | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 51f84ffa4..1a85674b1 100644
--- a/Makefile
+++ b/Makefile
@@ -63,10 +63,11 @@ CORE_COMMENT?=		OPNsense ${CORE_FAMILY} package
 CORE_MAINTAINER?=	franco@opnsense.org
 CORE_WWW?=		https://opnsense.org/
 CORE_MESSAGE?=		Thanks for all the fish...
+# CORE_DEPENDS_armv6 is empty
+CORE_DEPENDS_amd64?=	beep bsdinstaller
+CORE_DEPENDS_i386?=	${CORE_DEPENDS_amd64}
 CORE_DEPENDS?=		apinger \
-			beep \
 			bind910 \
-			bsdinstaller \
 			bsnmp-regex \
 			bsnmp-ucd \
 			ca_root_nss \
@@ -175,7 +176,7 @@ manifest: want-git
 	@echo "prefix: ${LOCALBASE}"
 	@echo "vital: true"
 	@echo "deps: {"
-	@for CORE_DEPEND in ${CORE_DEPENDS}; do \
+	@for CORE_DEPEND in ${CORE_DEPENDS_${ARCH}} ${CORE_DEPENDS}; do \
 		if ! ${PKG} query '  %n: { version: "%v", origin: "%o" }' \
 		    $${CORE_DEPEND}; then \
 			echo ">>> Missing dependency: $${CORE_DEPEND}" >&2; \
@@ -188,7 +189,7 @@ name: force
 	@echo ${CORE_NAME}
 
 depends: force
-	@echo ${CORE_DEPENDS}
+	@echo ${CORE_DEPENDS_${ARCH}} ${CORE_DEPENDS}
 
 PKG_SCRIPTS=	+PRE_INSTALL +POST_INSTALL \
 		+PRE_UPGRADE +POST_UPGRADE \
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 56e756746..22e5a063f 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -30,6 +30,7 @@ OPENSSL?=	${LOCALBASE}/bin/openssl
 
 PKG!=		which pkg || echo true
 GIT!=		which git || echo true
+ARCH!=		uname -p
 
 all-stub: all
 	@echo "Nothing to do."
diff --git a/README.md b/README.md
index e028ccada..88468d162 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@ needs to be fetched from an external location.
 Several OPTIONS exist to customise the package, e.g.:
 
 * CORE_DEPENDS: a list of required dependencies for the package
+* CORE_DEPENDS_ARCH: a list of special <ARCH>-required packages
 * CORE_ORIGIN: sets a FreeBSD compatible package/ports origin
 * FLAVOUR: can be set to "OpenSSL" (default) or "LibreSSL"
 * CORE_COMMENT: a short description of the package