From 8765650fe012686cb7f97460964dbf208693383e Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Fri, 27 Nov 2020 20:54:03 +0100
Subject: rbutil: Remove buildserver modelname string.

This isn't needed anymore, and the only player it was actually used for
were the 8MB modded Archos ones, for which the usage was broken.

Change-Id: I2aa235113be2e6ae88973711bd8ee4734cbc266a
---
 rbutil/rbutilqt/base/systeminfo.cpp |  1 -
 rbutil/rbutilqt/base/systeminfo.h   |  1 -
 rbutil/rbutilqt/rbutil.ini          | 66 -------------------------------------
 3 files changed, 68 deletions(-)

(limited to 'rbutil')

diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp
index b9a7602a5b..959a073757 100644
--- a/rbutil/rbutilqt/base/systeminfo.cpp
+++ b/rbutil/rbutilqt/base/systeminfo.cpp
@@ -59,7 +59,6 @@ const static struct {
     { SystemInfo::Encoder,          ":platform:/encoder",           "" },
     { SystemInfo::Brand,            ":platform:/brand",             "" },
     { SystemInfo::Name,             ":platform:/name",              "" },
-    { SystemInfo::BuildserverModel, ":platform:/buildserver_modelname", "" },
     { SystemInfo::ConfigureModel,   ":platform:/configure_modelname", "" },
     { SystemInfo::PlayerPicture,    ":platform:/playerpic",         "" },
 };
diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h
index 1aef791975..23288a1999 100644
--- a/rbutil/rbutilqt/base/systeminfo.h
+++ b/rbutil/rbutilqt/base/systeminfo.h
@@ -72,7 +72,6 @@ class SystemInfo : public QObject
             Encoder,
             Brand,
             Name,
-            BuildserverModel,
             ConfigureModel,
             PlayerPicture,
         };
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 2d23a634ad..bbcb4d8059 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -126,8 +126,6 @@ platform137=surfansf20
 ;                   base/bootloader* classes
 ; bootloadername: name of the bootloader file on the server
 ; bootloaderfile: name of the bootloader file on the device
-; buildserver_modelname: target string used by the build server. Not
-;                        necessarily identical to configure string.
 ; manualname: different target name to use for manual. See Iriver H100 series fe.
 ; brand: the manufacturer of the device. Used to group in device tree
 ; encoder: encoder to use for talk clips and voice files
@@ -138,7 +136,6 @@ platform137=surfansf20
 ;
 [archosplayer]
 name="Jukebox Player 6000 / Jukebox Studio 5 / 10 / 20"
-buildserver_modelname=archosplayer
 bootloadermethod=none
 bootloadername=
 manualname=
@@ -150,7 +147,6 @@ encoder=lame
 
 [archosrecorder]
 name="Jukebox Recorder 6 / 10 / 15 / 20"
-buildserver_modelname=archosrecorder
 bootloadermethod=none
 bootloadername=
 manualname=
@@ -162,7 +158,6 @@ encoder=lame
 
 [archosrecorderv2]
 name="Jukebox Recorder v2 (20GB)"
-buildserver_modelname=archosrecorderv2
 bootloadermethod=none
 bootloadername=
 manualname=archosfmrecorder
@@ -174,7 +169,6 @@ encoder=lame
 
 [archosfmrecorder]
 name="Jukebox Recorder FM"
-buildserver_modelname=archosfmrecorder
 bootloadermethod=none
 bootloadername=
 manualname=
@@ -186,7 +180,6 @@ encoder=lame
 
 [archosondiosp]
 name="Ondio SP"
-buildserver_modelname=archosondiosp
 bootloadermethod=none
 bootloadername=
 manualname=
@@ -198,7 +191,6 @@ encoder=lame
 
 [archosondiofm]
 name="Ondio FM"
-buildserver_modelname=archosondiofm
 bootloadermethod=none
 bootloadername=
 manualname=
@@ -210,7 +202,6 @@ encoder=lame
 
 [iriverh100]
 name="iHP100 / iHP110"
-buildserver_modelname=iriverh100
 bootloadermethod=hex
 bootloadername=/iriver/8.0/bootloader-h100.bin
 bootloaderfile=/ihp_100.hex
@@ -224,7 +215,6 @@ encoder=rbspeex
 
 [iriverh120]
 name="iHP120 / iHP140 / H120 / H140"
-buildserver_modelname=iriverh120
 bootloadermethod=hex
 bootloadername=/iriver/8.0/bootloader-h120.bin
 bootloaderfile=/ihp_120.hex
@@ -238,7 +228,6 @@ encoder=rbspeex
 
 [iriverh300]
 name="H320 / H340"
-buildserver_modelname=iriverh300
 bootloadermethod=hex
 bootloadername=/iriver/8.0/bootloader-h300.bin
 bootloaderfile=/H300.hex
@@ -252,7 +241,6 @@ encoder=rbspeex
 
 [iriverh10_5gb]
 name="H10 (5 / 6GB) UMS"
-buildserver_modelname=iriverh10_5gb
 bootloadermethod=mi4
 bootloadername=/iriver/H10.mi4
 bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4
@@ -265,7 +253,6 @@ encoder=rbspeex
 
 [iriverh10_5gb.mtp]
 name="H10 (5 / 6GB) MTP"
-buildserver_modelname=iriverh10_5gb
 bootloadermethod=mi4
 bootloadername=/iriver/H10_5GB-MTP/H10.mi4
 bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4
@@ -278,7 +265,6 @@ encoder=rbspeex
 
 [iriverh10]
 name="H10 (20GB)"
-buildserver_modelname=iriverh10
 bootloadermethod=mi4
 bootloadername=/iriver/H10_20GC.mi4
 bootloaderfile=/System/H10_20GC.mi4
@@ -292,7 +278,6 @@ encoder=rbspeex
 
 [ipod1g2g]
 name="Ipod (1st / 2nd gen)"
-buildserver_modelname=ipod1g2g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipod1g2g.ipod
 manualname=
@@ -304,7 +289,6 @@ encoder=rbspeex
 
 [ipodcolor]
 name="Ipod Color / Photo / U2 (4th gen)"
-buildserver_modelname=ipodcolor
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipodcolor.ipod
 manualname=
@@ -316,7 +300,6 @@ encoder=rbspeex
 
 [ipodnano1g]
 name="Ipod Nano (1st gen)"
-buildserver_modelname=ipodnano1g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipodnano1g.ipod
 manualname=
@@ -328,7 +311,6 @@ encoder=rbspeex
 
 [ipodnano2g]
 name="Ipod Nano (2nd gen)"
-buildserver_modelname=ipodnano2g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipodnano2g.ipodx
 manualname=
@@ -340,7 +322,6 @@ encoder=rbspeex
 
 [ipod4g]
 name="Ipod (4th gen, greyscale)"
-buildserver_modelname=ipod4g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipod4g.ipod
 manualname=
@@ -352,7 +333,6 @@ encoder=rbspeex
 
 [ipodvideo]
 name="Ipod Video (5th gen)"
-buildserver_modelname=ipodvideo
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipodvideo.ipod
 manualname=
@@ -364,7 +344,6 @@ encoder=rbspeex
 
 [ipod6g]
 name="Ipod Classic (6th gen)"
-buildserver_modelname=ipod6g
 bootloadermethod=s5l
 bootloadername=/ipod/bootloader-ipod6g.ipod
 manualname=
@@ -376,7 +355,6 @@ encoder=rbspeex
 
 [ipod3g]
 name="Ipod (3rd gen)"
-buildserver_modelname=ipod3g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipod3g.ipod
 manualname=
@@ -388,7 +366,6 @@ encoder=rbspeex
 
 [ipodmini1g]
 name="Ipod Mini (1st gen)"
-buildserver_modelname=ipodmini1g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipodmini1g.ipod
 brand=Apple
@@ -399,7 +376,6 @@ encoder=rbspeex
 
 [ipodmini2g]
 name="Ipod Mini (2nd gen)"
-buildserver_modelname=ipodmini2g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipodmini2g.ipod
 manualname=ipodmini1g
@@ -411,7 +387,6 @@ encoder=rbspeex
 
 [iaudiox5]
 name="iAudio X5 / X5L"
-buildserver_modelname=iaudiox5
 bootloadermethod=file
 bootloadername=/iaudio/x5_fw.bin
 bootloaderfile=/FIRMWARE/x5_fw.bin
@@ -424,7 +399,6 @@ encoder=rbspeex
 
 [iaudiox5.v]
 name="iAudio X5V"
-buildserver_modelname=iaudiox5
 bootloadermethod=file
 bootloadername=/iaudio/x5v_fw.bin
 bootloaderfile=/FIRMWARE/x5v_fw.bin
@@ -437,7 +411,6 @@ encoder=rbspeex
 
 [iaudiom5]
 name="iAudio M5 / M5L"
-buildserver_modelname=iaudiom5
 bootloadermethod=file
 bootloadername=/iaudio/m5_fw.bin
 bootloaderfile=/FIRMWARE/m5_fw.bin
@@ -450,7 +423,6 @@ encoder=rbspeex
 
 [iaudiom3]
 name="iAudio M3 / M3L"
-buildserver_modelname=iaudiom3
 bootloadermethod=file
 bootloadername=/iaudio/cowon_m3.bin
 bootloaderfile=/FIRMWARE/cowon_m3.bin
@@ -463,7 +435,6 @@ encoder=rbspeex
 
 [gigabeatfx]
 name="Gigabeat F / X"
-buildserver_modelname=gigabeatfx
 bootloadermethod=file
 bootloadername=/toshiba/gigabeat-fx/FWIMG01.DAT
 bootloaderfile=/GBSYSTEM/FWIMG/FWIMG01.DAT
@@ -476,7 +447,6 @@ encoder=rbspeex
 
 [gigabeats]
 name="Gigabeat S"
-buildserver_modelname=gigabeats
 bootloadermethod=none
 manualname=
 brand=Toshiba
@@ -488,7 +458,6 @@ status=disabled
 
 [sansae200]
 name="Sansa e200v1 series"
-buildserver_modelname=sansae200
 bootloadermethod=sansa
 bootloadername=/sandisk-sansa/e200/PP5022.mi4
 manualname=
@@ -501,7 +470,6 @@ encoder=rbspeex
 
 [sansac200]
 name="Sansa c200v1 series"
-buildserver_modelname=sansac200
 bootloadermethod=sansa
 bootloadername=/sandisk-sansa/c200/firmware.mi4
 manualname=
@@ -513,7 +481,6 @@ encoder=rbspeex
 
 [sansae200v2]
 name="Sansa e200v2 series"
-buildserver_modelname=sansae200v2
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/e200v2/bootloader-e200v2.sansa
 bootloaderfile=/e200pa.bin,/e200pe.bin,/e200pf.bin
@@ -528,7 +495,6 @@ encoder=rbspeex
 
 [sansac200v2]
 name="Sansa c200v2 series"
-buildserver_modelname=sansac200v2
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/c200v2/bootloader-c200v2.sansa
 bootloaderfile=/c200pa.bin,/c200pe.bin,/c200pf.bin
@@ -543,7 +509,6 @@ encoder=rbspeex
 
 [sansafuze]
 name="Sansa Fuze"
-buildserver_modelname=sansafuze
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/fuze/bootloader-fuze.sansa
 bootloaderfile=/fuzea.bin
@@ -558,7 +523,6 @@ encoder=rbspeex
 
 [sansafuzev2]
 name="Sansa Fuze V2"
-buildserver_modelname=sansafuzev2
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/fuzev2/bootloader-fuzev2.sansa
 bootloaderfile=/fuzpa.bin
@@ -573,7 +537,6 @@ encoder=rbspeex
 
 [sansafuzeplus]
 name="Sansa Fuze+"
-buildserver_modelname=sansafuzeplus
 bootloadermethod=imx
 bootloadername=/sandisk-sansa/fuzeplus/bootloader-fuzeplus.sansa
 bootloaderfile=/firmware.sb
@@ -588,7 +551,6 @@ encoder=rbspeex
 
 [sansam200v4]
 name="Sansa m200v4"
-buildserver_modelname=sansam200v4
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/m200v4/bootloader-m200v4.sansa
 bootloaderfile=/m200a.bin
@@ -604,7 +566,6 @@ status=disabled
 
 [sansaclip]
 name="Sansa Clip"
-buildserver_modelname=sansaclip
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/clip/bootloader-clip.sansa
 bootloaderfile=/m300a.bin
@@ -619,7 +580,6 @@ encoder=rbspeex
 
 [sansaclipv2]
 name="Sansa Clip V2"
-buildserver_modelname=sansaclipv2
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/clipv2/bootloader-clipv2.sansa
 bootloaderfile=/m30pa.bin
@@ -634,7 +594,6 @@ encoder=rbspeex
 
 [sansaclipplus]
 name="Sansa Clip+"
-buildserver_modelname=sansaclipplus
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/clipplus/bootloader-clipplus.sansa
 bootloaderfile=/clppa.bin
@@ -649,7 +608,6 @@ encoder=rbspeex
 
 [sansaclipzip]
 name="Sansa Clip Zip"
-buildserver_modelname=sansaclipzip
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/clipzip/bootloader-clipzip.sansa
 bootloaderfile=/clpza.bin
@@ -664,7 +622,6 @@ encoder=rbspeex
 
 [mrobe100]
 name="m:robe100"
-buildserver_modelname=mrobe100
 bootloadermethod=mi4
 bootloadername=/olympus/mrobe100/pp5020.mi4
 bootloaderfile=/System/pp5020.mi4
@@ -677,7 +634,6 @@ encoder=rbspeex
 
 [ondavx747]
 name="VX747"
-buildserver_modelname=ondavx747
 bootloadermethod=chinachip
 bootloadername=/onda/vx747/ccpmp.bin
 bootloaderfile=/SG301.HXF
@@ -692,7 +648,6 @@ status=disabled
 
 [ondavx747p]
 name="VX747+"
-buildserver_modelname=ondavx747p
 bootloadermethod=chinachip
 bootloadername=/onda/vx747p/ccpmp.bin
 bootloaderfile=/SG301.HXF
@@ -707,7 +662,6 @@ status=disabled
 
 [ondavx777]
 name="VX777"
-buildserver_modelname=ondavx777
 bootloadermethod=chinachip
 bootloadername=/onda/vx777/ccpmp.bin
 bootloaderfile=/VX777.HXF
@@ -722,7 +676,6 @@ status=disabled
 
 [samsungyh820]
 name="YH-820"
-buildserver_modelname=samsungyh820
 bootloadermethod=mi4
 bootloadername=/samsung/yh820/FW_YH820.mi4
 bootloaderfile=/SYSTEM/FW_YH820.mi4
@@ -735,7 +688,6 @@ encoder=rbspeex
 
 [samsungyh920]
 name="YH-920"
-buildserver_modelname=samsungyh920
 bootloadermethod=mi4
 bootloadername=/samsung/yh920/PP5020.mi4
 bootloaderfile=/SYSTEM/FW_YH920.mi4, /SYSTEM/PP5020.mi4
@@ -748,7 +700,6 @@ encoder=rbspeex
 
 [samsungyh925]
 name="YH-925"
-buildserver_modelname=samsungyh925
 bootloadermethod=mi4
 bootloadername=/samsung/yh925/FW_YH925.mi4
 bootloaderfile=/SYSTEM/FW_YH925.mi4
@@ -761,7 +712,6 @@ encoder=rbspeex
 
 [cowond2]
 name="D2"
-buildserver_modelname=cowond2
 bootloadermethod=tcc
 bootloadername=/cowon/d2/bootloader-cowond2.bin
 bootloaderfile=/
@@ -777,7 +727,6 @@ status=disabled
 
 [vibe500]
 name="Vibe 500"
-buildserver_modelname=vibe500
 bootloadermethod=mi4
 bootloadername=/vibe500/jukebox.mi4
 bootloaderfile=/System/jukebox.mi4
@@ -791,7 +740,6 @@ encoder=rbspeex
 
 [mpiohd200]
 name="MPIO HD200"
-buildserver_modelname=mpiohd200
 bootloadermethod=mpio
 bootloadername=/mpiohd200/bootloader.mpio
 bootloaderfile=/SYSTEM/HD200_UPG.SYS
@@ -805,7 +753,6 @@ encoder=rbspeex
 
 [mpiohd300]
 name="MPIO HD300"
-buildserver_modelname=mpiohd300
 bootloadermethod=mpio
 bootloadername=/mpiohd300/bootloader.mpio
 bootloaderfile=/SYSTEM/HD300_UPG.SYS
@@ -819,7 +766,6 @@ encoder=rbspeex
 
 [gogearhdd1630]
 name="Philips GoGear HDD16x0 & HDD18x0 Series"
-buildserver_modelname=gogearhdd1630
 bootloadermethod=mi4
 bootloadername=/gogear/hdd1630/FWImage.ebn
 bootloaderfile=/System/FWImage.ebn
@@ -832,7 +778,6 @@ encoder=rbspeex
 
 [gogearhdd6330]
 name="Philips GoGear HDD63x0 Series"
-buildserver_modelname=gogearhdd6330
 bootloadermethod=mi4
 booloadername=/gogear/hdd6330/FWImage.ebn
 bootloaderfile=/System/FWImage.ebn
@@ -845,7 +790,6 @@ encoder=rbspeex
 
 [gogearsa9200]
 name="Philips GoGear SA9200"
-buildserver_modelname=gogearsa9200
 bootloadermethod=none
 bootloaderfile=/System/FWImage.ebn
 manualname=
@@ -858,7 +802,6 @@ status=disabled
 
 [creativezenxfi3]
 name="Creative Zen X-Fi3"
-buildserver_modelname=creativezenxfi3
 bootloadermethod=imx
 bootloadername=/creative/zenxfi3/bootloader-zenxfi3.creative
 bootloaderfile=/firmware.sb
@@ -873,7 +816,6 @@ encoder=rbspeex
 
 [xduoox3]
 name="xDuoo X3"
-buildserver_modelname=xduoox3
 bootloadermethod=bspatch
 bootloadername=/xduoo/X3-v11.bsdiff
 bootloaderfile=/update.zip
@@ -888,7 +830,6 @@ encoder=rbspeex
 
 [xduoox3ii]
 name="xDuoo X3 II"
-buildserver_modelname=xduoox3ii
 bootloadermethod=bspatch
 bootloadername=/xduoo/X3II-v13.bsdiff
 bootloaderfile=/update.upt
@@ -903,7 +844,6 @@ encoder=rbspeex
 
 [xduoox20]
 name="xDuoo X20"
-buildserver_modelname=xduoox20
 bootloadermethod=bspatch
 bootloadername=/xduoo/X20-v18.bsdiff
 bootloaderfile=/update.upt
@@ -918,7 +858,6 @@ encoder=rbspeex
 
 [agptekrocker]
 name="AGPTek Rocker"
-buildserver_modelname=agptekrocker
 bootloadermethod=bspatch
 bootloadername=/agptek/ROCKER-20171101.bsdiff
 bootloaderfile=/update.upt
@@ -933,7 +872,6 @@ encoder=rbspeex
 
 [aigoerosq]
 name="AIGO Eros Q"
-buildserver_modelname=aigoerosq
 bootloadermethod=bspatch
 bootloadername=/aigo/EROSQ-v18.bsdiff
 bootloaderfile=/update.upt
@@ -948,7 +886,6 @@ encoder=rbspeex
 
 [aigoerosk]
 name="AIGO Eros K"
-buildserver_modelname=aigoerosq
 bootloadermethod=bspatch
 bootloadername=/aigo/EROSK-v13.bsdiff
 bootloaderfile=/update.upt
@@ -963,7 +900,6 @@ encoder=rbspeex
 
 [agptekh3]
 name="AGPTek H3"
-buildserver_modelname=aigoerosq
 bootloadermethod=bspatch
 bootloadername=/agptek/H3-20180905.bsdiff
 bootloaderfile=/update.upt
@@ -978,7 +914,6 @@ encoder=rbspeex
 
 [surfansf20]
 name="Surfans F20"
-buildserver_modelname=aigoerosq
 bootloadermethod=bspatch
 bootloadername=/surfans/F20-v22.bsdiff
 bootloaderfile=/update.upt
@@ -993,7 +928,6 @@ encoder=rbspeex
 
 [hifiwalkerh2]
 name="HIFI WALKER H2"
-buildserver_modelname=aigoerosq
 bootloadermethod=bspatch
 bootloadername=/hifiwalker/H2-v12.bsdiff
 bootloaderfile=/update.upt
-- 
cgit