2 files changed, 0 insertions, 54 deletions

diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp
index aaddb3b36f..98facd8b5d 100644
--- a/rbutil/rbutilqt/base/systeminfo.cpp
+++ b/rbutil/rbutilqt/base/systeminfo.cpp
@@ -57,7 +57,6 @@ const static struct {
     { SystemInfo::CurEncoder,           ":platform:/encoder",   "" },
     { SystemInfo::CurBrand,             ":platform:/brand",     "" },
     { SystemInfo::CurName,              ":platform:/name",      "" },
-    { SystemInfo::CurBuildserverModel,  ":platform:/buildserver_modelname", "" },
     { SystemInfo::CurConfigureModel,    ":platform:/configure_modelname", "" },
 };
 
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index ce84cce9d5..4ac2bce76e 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -88,7 +88,6 @@ platform103=gogearsa9200
 
 [archosplayer]
 name="Jukebox Player 6000 / Jukebox Studio 5 / 10 / 20"
-buildserver_modelname=archosplayer
 bootloadermethod=none
 bootloadername=
 manualname=
@@ -98,7 +97,6 @@ encoder=lame
 
 [archosrecorder]
 name="Jukebox Recorder 6 / 10 / 15 / 20"
-buildserver_modelname=archosrecorder
 bootloadermethod=none
 bootloadername=
 manualname=
@@ -108,7 +106,6 @@ encoder=lame
 
 [archosrecorder.8mb]
 name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)"
-buildserver_modelname=archosrecorder8mb
 bootloadermethod=none
 bootloadername=
 manualname=recorder
@@ -118,7 +115,6 @@ encoder=lame
 
 [archosrecorderv2]
 name="Jukebox Recorder v2 (20GB)"
-buildserver_modelname=archosrecorderv2
 bootloadermethod=none
 bootloadername=
 manualname=
@@ -128,7 +124,6 @@ encoder=lame
 
 [archosfmrecorder]
 name="Jukebox Recorder FM"
-buildserver_modelname=archosfmrecorder
 bootloadermethod=none
 bootloadername=
 manualname=
@@ -138,7 +133,6 @@ encoder=lame
 
 [archosfmrecorder.8mb]
 name="Jukebox Recorder FM (with 8MiB memory)"
-buildserver_modelname=archosfmrecorder8mb
 bootloadermethod=none
 bootloadername=
 manualname=archosfmrecorder
@@ -148,7 +142,6 @@ encoder=lame
 
 [archosondiosp]
 name="Ondio SP"
-buildserver_modelname=archosondiosp
 bootloadermethod=none
 bootloadername=
 manualname=
@@ -158,7 +151,6 @@ encoder=lame
 
 [archosondiofm]
 name="Ondio FM"
-buildserver_modelname=archosondiofm
 bootloadermethod=none
 bootloadername=
 manualname=
@@ -168,7 +160,6 @@ encoder=lame
 
 [iriverh100]
 name="iHP100 / iHP110"
-buildserver_modelname=iriverh100
 bootloadermethod=hex
 bootloadername=/iriver/bootloader-h100.bin
 bootloaderfile=/ihp_100.hex
@@ -180,7 +171,6 @@ encoder=rbspeex
 
 [iriverh120]
 name="iHP120 / iHP140 / H120 / H140"
-buildserver_modelname=iriverh120
 bootloadermethod=hex
 bootloadername=/iriver/bootloader-h120.bin
 bootloaderfile=/ihp_120.hex
@@ -192,7 +182,6 @@ encoder=rbspeex
 
 [iriverh300]
 name="H320 / H340"
-buildserver_modelname=iriverh300
 bootloadermethod=hex
 bootloadername=/iriver/bootloader-h300.bin
 bootloaderfile=/H300.hex
@@ -204,7 +193,6 @@ encoder=rbspeex
 
 [iriverh10_5gb.ums]
 name="H10 (5 / 6GB) UMS"
-buildserver_modelname=iriverh10_5gb
 bootloadermethod=mi4
 bootloadername=/iriver/H10.mi4
 bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4
@@ -216,7 +204,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
@@ -228,7 +215,6 @@ encoder=rbspeex
 
 [iriverh10]
 name="H10 (20GB)"
-buildserver_modelname=iriverh10
 bootloadermethod=mi4
 bootloadername=/iriver/H10_20GC.mi4
 bootloaderfile=/System/H10_20GC.mi4
@@ -241,7 +227,6 @@ encoder=rbspeex
 
 [ipod1g2g]
 name="Ipod (1st / 2nd gen)"
-buildserver_modelname=ipod1g2g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipod1g2g.ipod
 manualname=
@@ -251,7 +236,6 @@ encoder=rbspeex
 
 [ipodcolor]
 name="Ipod Color / Photo / U2 (4th gen)"
-buildserver_modelname=ipodcolor
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipodcolor.ipod
 manualname=
@@ -261,7 +245,6 @@ encoder=rbspeex
 
 [ipodnano1g]
 name="Ipod Nano (1st gen)"
-buildserver_modelname=ipodnano1g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipodnano1g.ipod
 manualname=
@@ -271,7 +254,6 @@ encoder=rbspeex
 
 [ipodnano2g]
 name="Ipod Nano (2nd gen)"
-buildserver_modelname=ipodnano2g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipodnano2g.ipodx
 manualname=
@@ -281,7 +263,6 @@ encoder=rbspeex
 
 [ipod4g]
 name="Ipod (4th gen, greyscale)"
-buildserver_modelname=ipod4g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipod4g.ipod
 manualname=
@@ -291,7 +272,6 @@ encoder=rbspeex
 
 [ipodvideo]
 name="Ipod Video (5th gen)"
-buildserver_modelname=ipodvideo
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipodvideo.ipod
 manualname=
@@ -301,7 +281,6 @@ encoder=rbspeex
 
 [ipod3g]
 name="Ipod (3rd gen)"
-buildserver_modelname=ipod3g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipod3g.ipod
 manualname=
@@ -312,7 +291,6 @@ encoder=rbspeex
 
 [ipodmini1g]
 name="Ipod Mini (1st gen)"
-buildserver_modelname=ipodmini1g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipodmini1g.ipod
 brand=Apple
@@ -321,7 +299,6 @@ encoder=rbspeex
 
 [ipodmini2g]
 name="Ipod Mini (2nd gen)"
-buildserver_modelname=ipodmini2g
 bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipodmini2g.ipod
 manualname=ipodmini1g
@@ -331,7 +308,6 @@ encoder=rbspeex
 
 [iaudiox5]
 name="iAudio X5 / X5L"
-buildserver_modelname=iaudiox5
 bootloadermethod=file
 bootloadername=/iaudio/x5_fw.bin
 bootloaderfile=/FIRMWARE/x5_fw.bin
@@ -343,7 +319,6 @@ encoder=rbspeex
 
 [iaudiox5.v]
 name="iAudio X5V"
-buildserver_modelname=iaudiox5
 bootloadermethod=file
 bootloadername=/iaudio/x5v_fw.bin
 bootloaderfile=/FIRMWARE/x5v_fw.bin
@@ -354,7 +329,6 @@ encoder=rbspeex
 
 [iaudiom5]
 name="iAudio M5 / M5L"
-buildserver_modelname=iaudiom5
 bootloadermethod=file
 bootloadername=/iaudio/m5_fw.bin
 bootloaderfile=/FIRMWARE/m5_fw.bin
@@ -366,7 +340,6 @@ encoder=rbspeex
 
 [iaudiom3]
 name="iAudio M3 / M3L"
-buildserver_modelname=iaudiom3
 bootloadermethod=file
 bootloadername=/iaudio/cowon_m3.bin
 bootloaderfile=/FIRMWARE/cowon_m3.bin
@@ -378,7 +351,6 @@ encoder=rbspeex
 
 [gigabeatfx]
 name="Gigabeat F / X"
-buildserver_modelname=gigabeatfx
 bootloadermethod=file
 bootloadername=/toshiba/gigabeat-fx/FWIMG01.DAT
 bootloaderfile=/GBSYSTEM/FWIMG/FWIMG01.DAT
@@ -390,7 +362,6 @@ encoder=rbspeex
 
 [gigabeats]
 name="Gigabeat S"
-buildserver_modelname=gigabeats
 bootloadermethod=none
 manualname=
 brand=Toshiba
@@ -401,7 +372,6 @@ status=disabled
 
 [sansae200]
 name="Sansa e200v1 series"
-buildserver_modelname=sansae200
 bootloadermethod=sansa
 bootloadername=/sandisk-sansa/e200/PP5022.mi4
 manualname=
@@ -413,7 +383,6 @@ encoder=rbspeex
 
 [sansac200]
 name="Sansa c200v1 series"
-buildserver_modelname=sansac200
 bootloadermethod=sansa
 bootloadername=/sandisk-sansa/c200/firmware.mi4
 manualname=
@@ -424,7 +393,6 @@ encoder=rbspeex
 
 [sansae200v2]
 name="Sansa e200v2 series"
-buildserver_modelname=sansae200v2
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/e200v2/bootloader-e200v2.sansa
 bootloaderfile=/e200pa.bin
@@ -437,7 +405,6 @@ encoder=rbspeex
 
 [sansac200v2]
 name="Sansa c200v2 series"
-buildserver_modelname=sansac200v2
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/c200v2/bootloader-c200v2.sansa
 bootloaderfile=/c200pa.bin
@@ -450,7 +417,6 @@ encoder=rbspeex
 
 [sansafuze]
 name="Sansa Fuze"
-buildserver_modelname=sansafuze
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/fuze/bootloader-fuze.sansa
 bootloaderfile=/fuzea.bin
@@ -463,7 +429,6 @@ encoder=rbspeex
 
 [sansafuzev2]
 name="Sansa Fuze V2"
-buildserver_modelname=sansafuzev2
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/fuzev2/bootloader-fuzev2.sansa
 bootloaderfile=/fuzpa.bin
@@ -490,7 +455,6 @@ status=disabled
 
 [sansam200v4]
 name="Sansa m200v4"
-buildserver_modelname=sansam200v4
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/m200v4/bootloader-m200v4.sansa
 bootloaderfile=/m200a.bin
@@ -504,7 +468,6 @@ status=disabled
 
 [sansaclip]
 name="Sansa Clip"
-buildserver_modelname=sansaclip
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/clip/bootloader-clip.sansa
 bootloaderfile=/m300a.bin
@@ -517,7 +480,6 @@ encoder=rbspeex
 
 [sansaclipv2]
 name="Sansa Clip V2"
-buildserver_modelname=sansaclipv2
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/clipv2/bootloader-clipv2.sansa
 bootloaderfile=/m30pa.bin
@@ -530,7 +492,6 @@ encoder=rbspeex
 
 [sansaclipplus]
 name="Sansa Clip+"
-buildserver_modelname=sansaclipplus
 bootloadermethod=ams
 bootloadername=/sandisk-sansa/clipplus/bootloader-clipplus.sansa
 bootloaderfile=/clppa.bin
@@ -558,7 +519,6 @@ status=disabled
 
 [mrobe100]
 name="m:robe100"
-buildserver_modelname=mrobe100
 bootloadermethod=mi4
 bootloadername=/olympus/mrobe100/pp5020.mi4
 bootloaderfile=/System/pp5020.mi4
@@ -570,7 +530,6 @@ encoder=rbspeex
 
 [ondavx747]
 name="VX747"
-buildserver_modelname=ondavx747
 bootloadermethod=chinachip
 bootloadername=/onda/vx747/ccpmp.bin
 bootloaderfile=/SG301.HXF
@@ -583,7 +542,6 @@ status=disabled
 
 [ondavx747p]
 name="VX747+"
-buildserver_modelname=ondavx747p
 bootloadermethod=chinachip
 bootloadername=/onda/vx747p/ccpmp.bin
 bootloaderfile=/SG301.HXF
@@ -596,7 +554,6 @@ status=disabled
 
 [ondavx777]
 name="VX777"
-buildserver_modelname=ondavx777
 bootloadermethod=chinachip
 bootloadername=/onda/vx777/ccpmp.bin
 bootloaderfile=/VX777.HXF
@@ -609,7 +566,6 @@ status=disabled
 
 [samsungyh820]
 name="YH-820"
-buildserver_modelname=samsungyh820
 bootloadermethod=mi4
 bootloadername=/samsung/yh820/FW_YH820.mi4
 bootloaderfile=/SYSTEM/FW_YH820.mi4
@@ -621,7 +577,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
@@ -633,7 +588,6 @@ encoder=rbspeex
 
 [samsungyh925]
 name="YH-925"
-buildserver_modelname=samsungyh925
 bootloadermethod=mi4
 bootloadername=/samsung/yh925/FW_YH925.mi4
 bootloaderfile=/SYSTEM/FW_YH925.mi4
@@ -645,7 +599,6 @@ encoder=rbspeex
 
 [cowond2]
 name="D2"
-buildserver_modelname=cowond2
 bootloadermethod=tcc
 bootloadername=/cowon/d2/bootloader-cowond2.bin
 bootloaderfile=/
@@ -659,7 +612,6 @@ status=disabled
 
 [vibe500]
 name="Vibe 500"
-buildserver_modelname=vibe500
 bootloadermethod=mi4
 bootloadername=/vibe500/jukebox.mi4
 bootloaderfile=/System/jukebox.mi4
@@ -672,7 +624,6 @@ encoder=rbspeex
 
 [mpiohd200]
 name="MPIO HD200"
-buildserver_modelname=mpiohd200
 bootloadermethod=mpio
 bootloadername=/mpiohd200/bootloader.mpio
 bootloaderfile=/SYSTEM/HD200_UPG.SYS
@@ -685,7 +636,6 @@ status=disabled
 
 [mpiohd300]
 name="MPIO HD300"
-buildserver_modelname=mpiohd300
 bootloadermethod=mpio
 bootloadername=/mpiohd300/bootloader.mpio
 bootloaderfile=/SYSTEM/HD300_UPG.SYS
@@ -698,7 +648,6 @@ status=disabled
 
 [gogearhdd1630]
 name="Philips GoGear HDD16x0 & HDD18x0 Series"
-buildserver_modelname=gogearhdd1630
 bootloadermethod=mi4
 bootloadername=/gogear/hdd1630/FWImage.ebn
 bootloaderfile=/System/FWImage.ebn
@@ -710,7 +659,6 @@ encoder=rbspeex
 
 [gogearhdd6330]
 name="Philips GoGear HDD63x0 Series"
-buildserver_modelname=gogearhdd6330
 bootloadermethod=mi4
 booloadername=/gogear/hdd6330/FWImage.ebn
 bootloaderfile=/System/FWImage.ebn
@@ -722,7 +670,6 @@ encoder=rbspeex
 
 [gogearsa9200]
 name="Philips GoGear SA9200"
-buildserver_modelname=gogearsa9200
 bootloadermethod=none
 bootloaderfile=/System/FWImage.ebn
 manualname=