From bcc8eb52327ec40acec36ccd43459215d7b9a100 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 15 Aug 2020 15:25:23 +0200
Subject: [PATCH 1/2] ar71xx-generic: move CPE/WBS 210/220/510/520 minor
 versions to manifest_aliases

Only include the major version in the base image name or aliases.
---
 targets/ar71xx-generic | 48 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/targets/ar71xx-generic b/targets/ar71xx-generic
index a4a44e52..d267c949 100644
--- a/targets/ar71xx-generic
+++ b/targets/ar71xx-generic
@@ -251,18 +251,48 @@ if (env.GLUON_REGION or '') ~= '' then
 	tplink_region_suffix = '-' .. env.GLUON_REGION
 end
 
-device('tp-link-cpe210-v1.0', 'cpe210-220-v1', {
-	aliases = {'tp-link-cpe210-v1.1', 'tp-link-cpe220-v1.1'},
+device('tp-link-cpe210-v1', 'cpe210-220-v1', {
+	aliases = {
+		'tp-link-cpe220-v1',
+	},
+	manifest_aliases = {
+		'tp-link-cpe210-v1.0',
+		'tp-link-cpe210-v1.1',
+		'tp-link-cpe220-v1.1',
+	},
 })
-device('tp-link-cpe210-v2.0', 'cpe210-v2')
-device('tp-link-cpe210-v3.0', 'cpe210-v3')
-
-device('tp-link-cpe510-v1.0', 'cpe510-520-v1', {
-	aliases = {'tp-link-cpe510-v1.1', 'tp-link-cpe520-v1.1'},
+device('tp-link-cpe210-v2', 'cpe210-v2', {
+	manifest_aliases = {
+		'tp-link-cpe210-v2.0',
+	},
+})
+device('tp-link-cpe210-v3', 'cpe210-v3', {
+	manifest_aliases = {
+		'tp-link-cpe210-v3.0',
+	},
 })
 
-device('tp-link-wbs210-v1.20', 'wbs210-v1')
-device('tp-link-wbs510-v1.20', 'wbs510-v1')
+device('tp-link-cpe510-v1', 'cpe510-520-v1', {
+	aliases = {
+		'tp-link-cpe520-v1',
+	},
+	manifest_aliases = {
+		'tp-link-cpe510-v1.0',
+		'tp-link-cpe510-v1.1',
+		'tp-link-cpe520-v1.1',
+	},
+})
+
+device('tp-link-wbs210-v1', 'wbs210-v1', {
+	manifest_aliases = {
+		'tp-link-wbs210-v1.20',
+	},
+})
+device('tp-link-wbs510-v1', 'wbs510-v1', {
+	manifest_aliases = {
+		'tp-link-wbs510-v1.20',
+	},
+})
 
 device('tp-link-tl-wr710n-v1', 'tl-wr710n-v1', {
 	class = 'tiny', -- 32M ath9k

From 49e8d95bb424ec970c34debc660b42d943d525bc Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 15 Aug 2020 15:29:26 +0200
Subject: [PATCH 2/2] ar71xx-generic: add manifest_aliases for new CPE210 v3
 minor revisions

---
 targets/ar71xx-generic | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/targets/ar71xx-generic b/targets/ar71xx-generic
index d267c949..363ad019 100644
--- a/targets/ar71xx-generic
+++ b/targets/ar71xx-generic
@@ -269,6 +269,8 @@ device('tp-link-cpe210-v2', 'cpe210-v2', {
 device('tp-link-cpe210-v3', 'cpe210-v3', {
 	manifest_aliases = {
 		'tp-link-cpe210-v3.0',
+		'tp-link-cpe210-v3.1',
+		'tp-link-cpe210-v3.20',
 	},
 })