From e3bdfeefa16884aaca1777e53dcbaed100dc650e Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Mon, 4 Nov 2019 16:41:55 +0100
Subject: [PATCH] ipq806x: rename target to ipq806x-generic
This commit accounts for the target renaming which was done in upstream
commit 7407e723991 ("ipqx0xx: add Generic subtarget")
---
package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac | 2 +-
targets/{ipq806x => ipq806x-generic} | 0
targets/targets.mk | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename targets/{ipq806x => ipq806x-generic} (100%)
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
index 54687b74f..600a147f5 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
@@ -53,7 +53,7 @@ elseif platform.match('ar71xx', 'nand', {'hiveap-121'}) then
elseif platform.match('ipq40xx', 'generic', {'avm,fritzbox-4040',
'openmesh,a42', 'openmesh,a62'}) then
table.insert(try_files, 1, '/sys/class/net/eth0/address')
-elseif platform.match('ipq806x', nil, {'netgear,r7800'}) then
+elseif platform.match('ipq806x', 'generic', {'netgear,r7800'}) then
table.insert(try_files, 1, '/sys/class/net/eth1/address')
elseif platform.match('mpc85xx', 'p1020', {'aerohive,hiveap-330'}) then
table.insert(try_files, 1, '/sys/class/net/eth0/address')
diff --git a/targets/ipq806x b/targets/ipq806x-generic
similarity index 100%
rename from targets/ipq806x
rename to targets/ipq806x-generic
diff --git a/targets/targets.mk b/targets/targets.mk
index 958853bfd..63aaa09f5 100644
--- a/targets/targets.mk
+++ b/targets/targets.mk
@@ -25,6 +25,6 @@ endif
ifneq ($(BROKEN),)
$(eval $(call GluonTarget,ar71xx,mikrotik)) # BROKEN: no sysupgrade support
$(eval $(call GluonTarget,brcm2708,bcm2710)) # BROKEN: Untested
-$(eval $(call GluonTarget,ipq806x)) # BROKEN: See target file for details
+$(eval $(call GluonTarget,ipq806x,generic)) # BROKEN: See target file for details
$(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No AP+IBSS or 11s support
endif
--
GitLab