Chameleon

Chameleon Commit Details

Date:2011-10-25 22:10:04 (12 years 6 months ago)
Author:blackosx
Commit:1661
Parents: 1660
Message:Merge latest trunk changes in to branch. Update section for merging existing /Extra folder. All seems to be working well with just kernel flags left to look at now.
Changes:
M/branches/blackosx/i386/libsaio/ati.c
M/branches/blackosx
M/branches/blackosx/package/Scripts/Main/postinstall

File differences

branches/blackosx/i386/libsaio/ati.c
314314
315315
316316
317
318
319
317320
318321
319322
......
405408
406409
407410
408
411
409412
410413
411414
......
493496
494497
495498
499
500
496501
497502
498503
499504
500505
506
501507
502508
503509
......
548554
549555
550556
551
557
558
559
552560
561
562
553563
564
565
566
567
568
569
570
571
554572
555573
556574
575
576
557577
578
579
580
581
558582
583
559584
560585
561586
587
562588
589
563590
591
592
564593
594
595
596
597
598
599
600
601
602
565603
566604
567
568
605
569606
607
608
609
610
611
612
570613
571614
572615
......
650693
651694
652695
696
697
653698
654699
655700
656701
657702
658
703
659704
660
705
661706
662
707
708
709
710
663711
664
712
665713
666714
667715
......
12721320
12731321
12741322
1275
1323
1324
12761325
12771326
12781327
␉{ 0x94C3,␉0x2247148C, CHIP_FAMILY_RV610,␉␉"ATI Radeon HD 2400 LE",␉␉␉kNull␉␉},␊
␉{ 0x94C3,␉0x3000148C, CHIP_FAMILY_RV610,␉␉"ATI Radeon HD 2350 Series",␉␉kNull␉␉},␊
␉␊
␉{ 0x94C3,␉0x30001642, CHIP_FAMILY_RV610,␉␉"ATI Radeon HD 3410",␉␉␉␉kNull␉␉},␊
␉{ 0x94C3,␉0x37161642, CHIP_FAMILY_RV610,␉␉"ATI Radeon HD 2400 PRO",␉␉␉kNull␉␉},␊
␉␊
␉{ 0x94C3,␉0x3000174B, CHIP_FAMILY_RV610,␉␉"ATI Radeon HD 2350 Series",␉␉kNull␉␉},␊
␉{ 0x94C3,␉0xE370174B, CHIP_FAMILY_RV610,␉␉"ATI Radeon HD 2400 PRO",␉␉␉kNull␉␉},␊
␉{ 0x94C3,␉0xE400174B, CHIP_FAMILY_RV610,␉␉"ATI Radeon HD 2400 PRO",␉␉␉kNull␉␉},␊
␉␊
␉{ 0x9598,␉0xB3831002, CHIP_FAMILY_RV635,␉␉"ATI All-in-Wonder HD",␉␉␉␉kNull␉␉},␊
␉␊
␉{ 0x9598,␉0x30001043, CHIP_FAMILY_RV635,␉␉"HD3730",␉␉␉␉␉␉␉kNull␉␉},␊
␉{ 0x9598,␉0x30001043, CHIP_FAMILY_RV635,␉␉"ATI Radeon HD 3730",␉␉␉␉kNull␉␉},␊
␉{ 0x9598,␉0x30011043, CHIP_FAMILY_RV635,␉␉"ATI Radeon HD 4570",␉␉␉␉kNull␉␉},␊
␉␊
␉{ 0x9598,␉0x3000148C, CHIP_FAMILY_RV635,␉␉"ATI Radeon HD 3730",␉␉␉␉kNull␉␉},␊
␉{ 0x68B8,␉0x200B1787, CHIP_FAMILY_JUNIPER,␉"ATI Radeon HD 5770",␉␉␉␉kVervet␉␉},␊
␉{ 0x68B8,␉0x22881787, CHIP_FAMILY_JUNIPER,␉"ATI Radeon HD 5770",␉␉␉␉kVervet␉␉},␊
␉␊
␉{ 0x68BF,␉0x220E1458, CHIP_FAMILY_JUNIPER,␉"ATI Radeon HD 6750",␉␉␉␉kVervet␉␉},␊
␉␊
␉{ 0x68C0,␉0x1594103C, CHIP_FAMILY_REDWOOD,␉"AMD Radeon HD 6570M",␉␉␉␉kNull␉␉},␊
␉␊
␉{ 0x68C0,␉0x392717AA, CHIP_FAMILY_REDWOOD,␉"ATI Mobility Radeon HD 5730",␉␉kNull␉␉},␊
␉␊
␉{ 0x68C1,␉0x033E1025, CHIP_FAMILY_REDWOOD,␉"ATI Mobility Radeon HD 5650",␉␉kNull␉␉},␊
␉␊
␉{ 0x68C1,␉0x9071104D,␉CHIP_FAMILY_REDWOOD,␉"ATI Mobility Radeon HD 5650",␉␉kEulemur␉},␊
␉␊
␉{ 0x68C8,␉0x2306103C, CHIP_FAMILY_REDWOOD,␉"ATI FirePro V4800 (FireGL)",␉␉kNull␉␉},␊
␉{ 0x6718,␉0x67181002, CHIP_FAMILY_CAYMAN,␉␉"AMD Radeon HD 6970",␉␉␉␉kNull␉␉},␊
␉␊
␉{ 0x6718,␉0x31301682, CHIP_FAMILY_CAYMAN,␉␉"AMD Radeon HD 6970",␉␉␉␉kNull␉␉},␊
␉␊
␊
␉{ 0x6738,␉0x00D01002,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870",␉␉␉␉kDuckweed␉},␊
␉{ 0x6738,␉0x21FA1002,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870",␉␉␉␉kDuckweed␉},␊
␉{ 0x6738,␉0x67381002, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870",␉␉␉␉kDuckweed␉},␊
␊
␉{ 0x6738,␉0x21FA1458,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870",␉␉␉␉kDuckweed␉},␊
␉␊
␉{ 0x6738,␉0x31031682,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870",␉␉␉␉kDuckweed␉},␊
␉{ 0x6738,␉0x31041682,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870",␉␉␉␉kDuckweed␉},␊
␉␊
␉{ 0x6738,␉0xE178174B,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870",␉␉␉␉kDuckweed␉},␊
␉␊
␉{ 0x6738,␉0x20101787,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870",␉␉␉␉kDuckweed␉},␊
␉{ 0x6738,␉0x23051787,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870",␉␉␉␉kDuckweed␉},␊
␉␊
␉{ 0x6739,␉0x67391002, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6850",␉␉␉␉kDuckweed␉},␊
␉␊
␉{ 0x6739,␉0x21F81458, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6850",␉␉␉␉kDuckweed␉},␊
␊
␉{ 0x6739,␉0x24411462, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6850",␉␉␉␉kDuckweed␉},␊
␉␊
␉{ 0x6739,␉0x31101682, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6850",␉␉␉␉kDuckweed␉}, ␊
␉␊
␉{ 0x6739,␉0xE177174B,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6850",␉␉␉␉kDuckweed␉},␊
␉␉␊
␉{ 0x6740,␉0x1657103C, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6770M",␉␉␉␉kNull␉␉},␊
␉{ 0x6740,␉0x165A103C, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6770M",␉␉␉␉kNull␉␉},␊
␉␊
␉{ 0x6741,␉0x050E1025, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6650M",␉␉␉␉kNull␉␉},␊
␉{ 0x6741,␉0x05131025, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6650M",␉␉␉␉kNull␉␉},␊
␉␊
␉{ 0x6741,␉0x1646103C, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6750M",␉␉␉␉kNull␉␉},␊
␉␊
␉{ 0x6741,␉0x9080104D,␉CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6630M",␉␉␉␉kNull␉␉},␊
␊
␉{ 0x6758,␉0x67581002,␉CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6670",␉␉␉␉kBulrushes␉},␊
␉␊
␉{ 0x6758,␉0x22051458,␉CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6670",␉␉␉␉kBulrushes␉},␊
␉␊
␉{ 0x6758,␉0xE194174B,␉CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6670",␉␉␉␉kBulrushes␉},␊
␉␊
␉{ 0x6758,␉0x31811682,␉CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6670",␉␉␉␉kBulrushes␉},␊
␉{ 0x6758,␉0x31831682,␉CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6670",␉␉␉␉kBulrushes␉},␊
␉␊
␉{ 0x6758,␉0xE1941746,␉CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6670",␉␉␉␉kBulrushes␉},␊
␉␊
␉{ 0x6759,␉0xE193174B, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6570",␉␉␉␉kNull␉␉},␊
␉␊
␉{ 0x6760,␉0x04CC1028,␉CHIP_FAMILY_RV730,␉␉"AMD Radeon HD 6490M",␉␉␉␉kNull␉␉},␊
␉{ 0x6760,␉0x1CB21043, CHIP_FAMILY_RV730,␉␉"AMD Radeon HD 6470M",␉␉␉␉kNull␉␉},␊
␉{ 0x6760,␉0x04CC1028,␉CHIP_FAMILY_CAICOS,␉␉"AMD Radeon HD 6490M",␉␉␉␉kNull␉␉},␊
␉␊
␉{ 0x6760,␉0x1CB21043, CHIP_FAMILY_CAICOS,␉␉"AMD Radeon HD 6470M",␉␉␉␉kNull␉␉},␊
␉␊
␉{ 0x6779,␉0x64501092,␉CHIP_FAMILY_CAICOS,␉␉"AMD Radeon HD 6450",␉␉␉␉kBulrushes␉},␊
␉␊
␉{ 0x6779,␉0xE164174B,␉CHIP_FAMILY_CAICOS,␉␉"AMD Radeon HD 6450",␉␉␉␉kBulrushes␉},␉␊
␉␊
␉/* standard/default models */␊
␉{ 0x9400,␉0x00000000, CHIP_FAMILY_R600,␉␉"ATI Radeon HD 2900 XT",␉␉␉kNull␉␉},␊
␉{ 0x9405,␉0x00000000, CHIP_FAMILY_R600,␉␉"ATI Radeon HD 2900 GT",␉␉␉kNull␉␉},␊
␉{ 0x6718,␉0x00000000, CHIP_FAMILY_CAYMAN,␉␉"AMD Radeon HD 6970 Series",␉␉kNull␉␉},␊
␉{ 0x6719,␉0x00000000, CHIP_FAMILY_CAYMAN,␉␉"AMD Radeon HD 6950 Series",␉␉kNull␉␉},␊
␉␊
␉{ 0x6720,␉0x00000000, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6900M Series",␉␉kNull␉␉},␊
␉␊
␉{ 0x6738,␉0x00000000, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870 Series",␉␉kDuckweed␉},␊
␉{ 0x6739,␉0x00000000, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6850 Series",␉␉kDuckweed␉},␊
␉{ 0x673E,␉0x00000000, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6790 Series",␉␉kNull␉␉},␊
␉␊
␉{ 0x6740,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6700M Series",␉␉kNull␉␉},␊
␉{ 0x6741,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6600/6700M Series",␉kNull␉␉},␊
␉{ 0x6741,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6600M/6700M Series",␉kNull␉␉},␊
␉␊
␉{ 0x6758,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6670 Series",␉␉kNull␉␉},␊
␉{ 0x6758,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6670 Series",␉␉kBulrushes␉},␊
␉{ 0x6759,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6500 Series",␉␉kNull␉␉},␊
␉␊
␊
␉{ 0x6760,␉0x00000000, CHIP_FAMILY_CAICOS,␉␉"AMD Radeon HD 6400M Series",␉␉kNull␉␉},␊
␉{ 0x6761,␉0x00000000, CHIP_FAMILY_CAICOS,␉␉"AMD Radeon HD 6430M Series",␉␉kNull␉␉},␊
␉␉␊
␉{ 0x6770,␉0x00000000, CHIP_FAMILY_CAICOS,␉␉"AMD Radeon HD 6400 Series",␉␉kNull␉␉},␊
␉{ 0x6779,␉0x00000000, CHIP_FAMILY_CAICOS,␉␉"AMD Radeon HD 6450 Series",␉␉kNull␉␉},␊
␉{ 0x6779,␉0x00000000, CHIP_FAMILY_CAICOS,␉␉"AMD Radeon HD 6450 Series",␉␉kBulrushes␉},␊
␉␊
␉{ 0x0000,␉0x00000000, CHIP_FAMILY_UNKNOW,␉␉NULL,␉␉␉␉␉␉␉␉kNull␉␉}␊
};␊
␉␊
␉if (!card->info->device_id || !card->info->cfg_name)␊
␉{␊
␉␉printf("Unsupported card!\n");␊
␉␉verbose("Unsupported ATI card! Device ID: [%04x:%04x] Subsystem ID: [%08x] \n", ␊
␉␉␉␉pci_dev->vendor_id, pci_dev->device_id, pci_dev->subsys_id);␊
␉␉return false;␊
␉}␊
␉␊
branches/blackosx/package/Scripts/Main/postinstall
4848
4949
5050
51
51
5252
5353
5454
......
5858
5959
6060
61
61
6262
6363
6464
......
151151
152152
153153
154
155
154156
155157
156158
......
159161
160162
161163
164
162165
163166
164167
165168
169
166170
167171
168172
......
170174
171175
172176
177
173178
174179
175180
181
182
183
184
176185
177186
187
188
189
190
191
178192
193
194
195
196
197
179198
180199
181200
......
193212
194213
195214
196
215
197216
198217
199
218
200219
201220
202221
203222
204223
205224
206
225
207226
208227
209
228
210229
211230
231
232
233
234
235
236
237
238
239
240
241
242
212243
213244
214245
if [ -e "${chamTemp}"/Extra/modules ]; then␊
ls "${chamTemp}"/Extra/modules | while read FILE␊
do␊
"$scriptDir"InstallLog.sh "${dest_vol}" "Installed module:$FILE"␊
"$scriptDir"InstallLog.sh "${dest_vol}" "Added module: $FILE"␊
done␊
fi␊
␉␉␉␊
if [ -e "${chamTemp}"/Extra/Themes ]; then␊
ls "${chamTemp}"/Extra/Themes | while read FILE␊
do␊
"$scriptDir"InstallLog.sh "${dest_vol}" "Installed Theme:$FILE"␊
"$scriptDir"InstallLog.sh "${dest_vol}" "Added Theme: $FILE"␊
done␊
fi␊
␊
# Does the user want to upgrade an existing /Extra folder?␊
␉# If so, then merge their existing one in to the temp one␊
␉if [ -e "$chamTemp/install_type_upgrade" ]; then␊
␉␉"$scriptDir"InstallLog.sh "${dest_vol}" "User selected to do an upgrade install."␊
␉␊
␉␉# first move the new org.chameleon.Boot.plist out of tmp␊
␉␉# Extra folder so we can merge that separately.␊
␉␉mv "$tempOCBP" "$chamTemp/holding.plist"␊
␉␉# and merge existing /Extra with temp one.␊
␉␉␉if [ -e "$dest_vol"/.ChameleonEFI ]; then␊
␉␉␉␉if [ -e "/Volumes/EFI/Extra" ]; then␊
␉␉␉␉␉"$scriptDir"InstallLog.sh "${dest_vol}" "Merging existing /Volumes/EFI/Extra folder."␊
␉␉␉␉␉ditto --noextattr --noqtn /Volumes/EFI/Extra "$chamTemp"/Extra␊
␉␉␉␉fi␊
␉␉␉else␊
␉␉␉␉if [ -e "$dest_vol/Extra" ]; then␊
␉␉␉␉␉"$scriptDir"InstallLog.sh "${dest_vol}" "Merging existing ${dest_vol}/Extra folder."␊
␉␉␉␉␉ditto --noextattr --noqtn "${dest_vol}"/Extra "$chamTemp"/Extra␊
␉␉␉␉fi␊
␉␉␉fi␊
␉␉# Check existing plist name for old naming convention␊
␉␉# and change to new convention.␊
␉␉if [ -e "$chamTemp"/Extra/com.apple.Boot.plist ]; then␊
␉␉␉"$scriptDir"InstallLog.sh "${dest_vol}" "Renaming existing com.apple.Boot.plist to org.chameleon.Boot.plist."␊
␉␉␉mv "$chamTemp"/Extra/com.apple.Boot.plist "$tempOCBP"␊
␉␉fi␊
␉␉␊
␉␉# Before merging org.chameleon.Boot.plist, copy any␊
␉␉# existing kernel flags.␊
␉␉␊
␉␉␊
␉␉# Merge new org.chameleon.Boot.plist (holding.plist)␊
␉␉# with their currently existing one.␊
␉␉"$scriptDir"InstallLog.sh "${dest_vol}" "Merging new options into org.chameleon.Boot.plist.␊
NOTE: Please check the new merged org.chameleon.Boot.plist as␊
NOTE: any existing keys will NOT have been updated.␊
NOTE: For example: If you already had Wait=No as a boot option␊
NOTE: and chose Wait=Yes from the list, this will NOT be changed."␊
␉␉sudo /usr/libexec/plistbuddy -c "Merge $chamTemp/holding.plist" "$tempOCBP"␊
␉␉␉␊
␉␉# TO DO - kernel flags! - maybe read existing, delete them, re-add existing and new?␊
␉␉␊
␉elif [ -e "$chamTemp/install_type_new" ]; then␊
␉␉"$scriptDir"InstallLog.sh "${dest_vol}" "User selected to make a new install."␊
␉fi␊
␉␊
# ---------------------------------------------␊
␊
# Does an /Extra folder already exist?␊
if [ -e "$dest_vol"/Extra ]; then␊
"$scriptDir"InstallLog.sh "${dest_vol}" "Found existing $dest_vol/Extra folder. Renaming it $dest_vol/Extra-OLD-$( date "+%H-%M-%S" )"␊
"$scriptDir"InstallLog.sh "${dest_vol}" "Moving $dest_vol/Extra folder to $dest_vol/Extra-OLD-$( date "+%H-%M-%S" )"␊
mv "$dest_vol/Extra" "$dest_vol/Extra_OLD-"$( date "+%H-%M-%S" )␊
fi␊
"$scriptDir"InstallLog.sh "${dest_vol}" "Writing folder: $dest_vol/Extra"␊
"$scriptDir"InstallLog.sh "${dest_vol}" "Writing new Extra folder to: $dest_vol/"␊
echo "Copying $chamTemp/Extra TO $dest_vol"␊
cp -R "$chamTemp"/Extra "$dest_vol"␊
else␊
# The EFI system partition install option was chosen␊
# Does a /Volumes/Extra folder already exist?␊
if [ -e "/Volumes/EFI/Extra" ]; then␊
"$scriptDir"InstallLog.sh "${dest_vol}" "Found existing /Volumes/EFI/Extra folder. Renaming it Extra-OLD-$( date "+%H-%M-%S" )"␊
"$scriptDir"InstallLog.sh "${dest_vol}" "Moving /Volumes/EFI/Extra folder to /Volumes/EFI/Extra-OLD-$( date "+%H-%M-%S" )"␊
mv "/Volumes/EFI/Extra" "/Volumes/EFI/Extra_OLD-"$( date "+%H-%M-%S" )␊
fi␊
"$scriptDir"InstallLog.sh "${dest_vol}" "Writing folder: /Volumes/EFI/Extra"␊
"$scriptDir"InstallLog.sh "${dest_vol}" "Writing new Extra folder to: /Volumes/EFI/"␊
cp -R "$chamTemp"/Extra "/Volumes/EFI"␊
fi␊
else␊
if [ ! -f "$dest_vol"/.ChameleonEFI ]; then␊
if [ -e "$dest_vol"/Extra ]; then␊
␉␉␉␉"$scriptDir"InstallLog.sh "${dest_vol}" "No elements selected for adding to an Extra folder,␊
so leaving existing $dest_vol/Extra folder untouched."␊
fi␊
else␊
if [ -e "/Volumes/EFI/Extra" ]; then␊
"$scriptDir"InstallLog.sh "${dest_vol}" "No elements selected for adding to an Extra folder,␊
so leaving existing /Volumes/EFI/Extra folder untouched."␊
fi␊
fi␊
fi␊
␊
␉# Unmount ALL mounted volumes named EFI␊␊

Archive Download the corresponding diff file

Revision: 1661