From: Paul Spooren <mail@aparcar.org>
Date: Tue, 26 Feb 2019 19:50:49 +0000 (+0100)
Subject: metadata: fixup "board"
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=26c16aec670d9206bef1065d0de4c423a6cbdcbe;p=openwrt%2Fstaging%2Fjow.git

metadata: fixup "board"

currently the "board" parameter contains $(BOARD) which actually results
to `<target>` (like ramips, ar71xx) without subtarget. However, one
actually excepts (not?) to contain BOARD_NAME or DEVICE_NAME.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/include/image-commands.mk b/include/image-commands.mk
index ade370cc0d..c6b4b23ce3 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -360,7 +360,7 @@ metadata_json = \
 			"dist": "$(call json_quote,$(VERSION_DIST))", \
 			"version": "$(call json_quote,$(VERSION_NUMBER))", \
 			"revision": "$(call json_quote,$(REVISION))", \
-			"board": "$(call json_quote,$(BOARD))" \
+			"board": "$(call json_quote,$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)))" \
 		} \
 	}'