Revert r30869 "Remove buildserver_modelname value."

The buildserver_modelname is still in use, and the commit missed some parts on
removal, causing segfaults on start.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30884 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 54 insertions, 0 deletions

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