From 8d6a9b4197e9df73daaab9b8bcc761485ddbbfb8 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 16 Sep 2018 19:03:36 +0200
Subject: [PATCH] firmware: hijack firmare-product for build-time metadata

---
 Makefile                         | 1 +
 Mk/defaults.mk                   | 3 +++
 src/opnsense/firmware-product.in | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index 67cdef2b5..526b05590 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,7 @@ CORE_HASH=	${CORE_COMMIT:C/^.*-//1}
 
 CORE_ABI?=	18.7
 CORE_ARCH?=	${ARCH}
+CORE_FLAVOUR=	${FLAVOUR}
 CORE_OPENVPN?=	# empty
 CORE_PHP?=	71
 CORE_PYTHON?=	27
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 710f32af7..27b77a6a7 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -33,15 +33,18 @@ GIT!=		which git || echo true
 ARCH!=		uname -p
 
 REPLACEMENTS=	CORE_ABI \
+		CORE_ARCH \
 		CORE_COPYRIGHT_HOLDER \
 		CORE_COPYRIGHT_WWW \
 		CORE_COPYRIGHT_YEARS \
+		CORE_FLAVOUR \
 		CORE_HASH \
 		CORE_MAINTAINER \
 		CORE_NAME \
 		CORE_PACKAGESITE \
 		CORE_PRODUCT \
 		CORE_REPOSITORY \
+		CORE_VERSION \
 		CORE_WWW
 
 MAKE_REPLACE=	# empty
diff --git a/src/opnsense/firmware-product.in b/src/opnsense/firmware-product.in
index 3239d3e84..029b9a603 100644
--- a/src/opnsense/firmware-product.in
+++ b/src/opnsense/firmware-product.in
@@ -1,10 +1,14 @@
 {
+    "product_abi": "%%CORE_ABI%%",
+    "product_arch": "%%CORE_ARCH%%",
     "product_copyright_owner": "%%CORE_COPYRIGHT_HOLDER%%",
     "product_copyright_url": "%%CORE_COPYRIGHT_WWW%%",
     "product_copyright_years": "%%CORE_COPYRIGHT_YEARS%%",
     "product_email": "%%CORE_MAINTAINER%%",
+    "product_flavour": "%%CORE_FLAVOUR%%",
     "product_hash": "%%CORE_HASH%%",
     "product_id": "%%CORE_NAME%%",
     "product_name": "%%CORE_PRODUCT%%",
+    "product_version": "%%CORE_VERSION%%",
     "product_website": "%%CORE_WWW%%"
 }