From 88e6bc5278b37bbd1ce9c1f2a1bf1a4c89d9fb92 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Sun, 3 Nov 2019 22:39:47 +0100
Subject: [PATCH] ipq40xx: rename target to ipq40xx-generic
This commit accounts for the target renaming which was done in upstream
commit 7407e723991 ("ipqx0xx: add Generic subtarget")
---
docs/user/supported_devices.rst | 4 ++--
package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac | 4 ++--
targets/{ipq40xx => ipq40xx-generic} | 0
targets/targets.mk | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
rename targets/{ipq40xx => ipq40xx-generic} (100%)
diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
index 2070292dc..ae9e5ea07 100644
--- a/docs/user/supported_devices.rst
+++ b/docs/user/supported_devices.rst
@@ -191,8 +191,8 @@ brcm2708-bcm2709
* RaspberryPi 2
-ipq40xx [#80211s]_
-------------------
+ipq40xx-generic [#80211s]_
+--------------------------
* AVM
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 5adc83ba2..54687b74f 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
@@ -50,8 +50,8 @@ elseif platform.match('ar71xx', 'generic', {'archer-c5', 'archer-c58-v1',
table.insert(try_files, 1, '/sys/class/net/eth1/address')
elseif platform.match('ar71xx', 'nand', {'hiveap-121'}) then
table.insert(try_files, 1, '/sys/class/net/eth0/address')
-elseif platform.match('ipq40xx', nil, {'avm,fritzbox-4040',
- 'openmesh,a42', 'openmesh,a62'}) 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
table.insert(try_files, 1, '/sys/class/net/eth1/address')
diff --git a/targets/ipq40xx b/targets/ipq40xx-generic
similarity index 100%
rename from targets/ipq40xx
rename to targets/ipq40xx-generic
diff --git a/targets/targets.mk b/targets/targets.mk
index 1f5408294..958853bfd 100644
--- a/targets/targets.mk
+++ b/targets/targets.mk
@@ -16,7 +16,7 @@ $(eval $(call GluonTarget,x86,geode))
$(eval $(call GluonTarget,x86,64))
ifneq ($(GLUON_WLAN_MESH_11s)$(BROKEN),)
-$(eval $(call GluonTarget,ipq40xx))
+$(eval $(call GluonTarget,ipq40xx,generic))
$(eval $(call GluonTarget,ramips,mt7620))
$(eval $(call GluonTarget,ramips,mt76x8))
$(eval $(call GluonTarget,ramips,rt305x))
--
GitLab