From c8da2bc1453cab240c4dff8312b797d8dd579d0a Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Fri, 27 Nov 2020 21:11:00 +0100
Subject: [PATCH] rbutil: Treat Aigo Eros clones as variant of it.

Fixes installing those builds, since they relied on the broken
buildserver_modelname. Also simplifies internal handling.

Change-Id: I5b67b7d65ee2299e01ea4e009e47f93c3343911a
---
 rbutil/rbutilqt/rbutil.ini | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index bbcb4d8059..1c865cb233 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -108,30 +108,36 @@ platform130=xduoox3ii
 platform131=xduoox20
 platform132=agptekrocker
 platform133=aigoerosq
-platform134=aigoerosk
-platform135=agptekh3
-platform136=hifiwalkerh2
-platform137=surfansf20
+; clones of aigoerosq, treat them as variants of it (identical build, different bootloaders)
+platform134=aigoerosq.k
+platform135=aigoerosq.agptekh3
+platform136=aigoerosq.hifiwalkerh2
+platform137=aigoerosq.surfansf20
 
 ; devices sections
 ;
 ; Each device has a section here that corresponds to an entry in the
-; [platforms] section.  The section is using the same string configure uses. It
-; might add a postfix (separated with a .) to distinguish variants like
+; [platforms] section.
+; ** The [section] is using the same string configure uses. **
+; It might add a postfix (separated with a .) to distinguish variants like
 ; iaudiox5 vs. iaudiox5.v which are identical for Rockbox itself, but have
 ; differences (in this case: require different bootloaders.)
+; When downloading the build from rockbox.org the [section] string is used.
 ;
 ; name: the human readable name that is displayed to the user
 ; bootloadermethod: the installation method for the bootloader. See
 ;                   base/bootloader* classes
 ; bootloadername: name of the bootloader file on the server
 ; bootloaderfile: name of the bootloader file on the device
-; manualname: different target name to use for manual. See Iriver H100 series fe.
+; manualname: different target name to use for manual. F.e. ipodmini2g uses the
+;             same manual as ipodmini1g.
 ; brand: the manufacturer of the device. Used to group in device tree
 ; encoder: encoder to use for talk clips and voice files
-; usbid: VID / PID value for detecting the player
+; usbid: VID / PID value for detecting the player. Can be a list.
+;        If multiple players use the same ID the detection will be ambiguous
+;        and the user has to manually choose.
 ; usberror: VID / PID value for detecting the player in an incompatible mode
-;           (MTP vs MSC)
+;           (MTP vs MSC). Can be a list.
 ; status: allows hiding the target from the list of devices.
 ;
 [archosplayer]
@@ -884,7 +890,7 @@ configure_modelname=aigoerosq
 playerpic=aigoerosq
 encoder=rbspeex
 
-[aigoerosk]
+[aigoerosq.k]
 name="AIGO Eros K"
 bootloadermethod=bspatch
 bootloadername=/aigo/EROSK-v13.bsdiff
@@ -898,7 +904,7 @@ configure_modelname=aigoerosq
 playerpic=aigoerosk
 encoder=rbspeex
 
-[agptekh3]
+[aigoerosq.agptekh3]
 name="AGPTek H3"
 bootloadermethod=bspatch
 bootloadername=/agptek/H3-20180905.bsdiff
@@ -912,7 +918,7 @@ configure_modelname=aigoerosq
 playerpic=aigoerosk
 encoder=rbspeex
 
-[surfansf20]
+[aigoerosq.surfansf20]
 name="Surfans F20"
 bootloadermethod=bspatch
 bootloadername=/surfans/F20-v22.bsdiff
@@ -926,7 +932,7 @@ configure_modelname=aigoerosq
 playerpic=aigoerosk
 encoder=rbspeex
 
-[hifiwalkerh2]
+[aigoerosq.hifiwalkerh2]
 name="HIFI WALKER H2"
 bootloadermethod=bspatch
 bootloadername=/hifiwalker/H2-v12.bsdiff