Chameleon

Chameleon Commit Details

Date:2011-12-28 14:28:36 (8 years 10 months ago)
Author:ErmaC
Commit:1755
Parents: 1754
Message:- sync with trunk.
Changes:
M/branches/ErmaC/Trunk/package/Changes.txt
M/branches/ErmaC/Modules/package/Resources/it.lproj/Localizable.strings
M/branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c
M/branches/ErmaC/Trunk/package/Resources/ar.lproj/Localizable.strings
M/branches/ErmaC/Trunk/package/buildpkg.sh
M/branches/ErmaC/Modules/package/Changes.txt
M/branches/ErmaC/Trunk/CHANGES
M/branches/ErmaC/Trunk/i386/libsaio/ati.c
M/branches/ErmaC/Modules/package/Resources/ar.lproj/Localizable.strings
M/branches/ErmaC/Modules/package/buildpkg.sh
M/branches/ErmaC/Trunk/package/Resources/bg.lproj/Localizable.strings
M/branches/ErmaC/Modules/CHANGES
M/branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c
M/branches/ErmaC/Trunk/package/Resources/it.lproj/Localizable.strings
M/branches/ErmaC/Modules/package/Resources/bg.lproj/Localizable.strings

File differences

branches/ErmaC/Trunk/i386/libsaio/ati.c
564564
565565
566566
567
567
568568
569569
570570
{ 0x68D8,0x5690174B, CHIP_FAMILY_REDWOOD,"ATI Radeon HD 5690",kNull},
{ 0x68D8,0x5730174B, CHIP_FAMILY_REDWOOD,"ATI Radeon HD 5730",kNull},
{ 0x68D8,0xE151174B, CHIP_FAMILY_REDWOOD,"ATI Radeon HD 5670",kBaboon},
{ 0x68D8,0xE151174B, CHIP_FAMILY_REDWOOD,"ATI Radeon HD 5670",kEulemur},
{ 0x68D8,0x30001787, CHIP_FAMILY_REDWOOD,"ATI Radeon HD 5730",kNull},
branches/ErmaC/Trunk/package/Changes.txt
1
1
22
3
4
5
6
7
8
9
10
11
12
13
14
15
16
317
418
519
......
4458
4559
4660
47
61
- Keylayout / Keymaps fixed and made a mandatory install.
- Change Localizable.strings to match the recent changes to the install process.
- Improve messages written to the installation log.
- Change upgrade install to only backup /Extra folder if necessary.
- JrCs - Enhanced installer - We can add an option without an associated package - We can have an option that install
multiple packages - No more "fake" option (none) - The package that is build is already compressed (no need to
compress it again)
- JrCs - Update postinstall script - Fix a bug where kernel flags are not set properly - Fix indent - Add some comments.
- JrCs - Automaticaly select upgrade option if /Extra/org.chameleon.Boot.plist file exists on the target volume.
- JrCs - Keylayout / Keymaps fixed and made a mandatory install when a keymap is chosen.
- Add option to upgrade an existing install - or more exactly, merge newly selected options with an existing /Extra folder. Also, rename an existing /Extra/com.apple.Boot.plist to /Extra/org.chameleon.Boot.plist.
- Change the layout/wording displayed in the installer (English only) and give it a facelift. Adjust background image to scale to fit in the window.
- slimpkg.sh changed to match the revised code in buildpkg.sh where applicable.
- English Localizable.strings revised to match latest additions and some texts updated.
- English Localizable.strings revised to match latest additions and some texts updated.
branches/ErmaC/Trunk/package/buildpkg.sh
117117
118118
119119
120
120
121121
122122
123123
......
140140
141141
142142
143
143
144144
145145
146146
......
158158
159159
160160
161
161
162162
163163
164164
......
169169
170170
171171
172
172
173173
174174
175175
......
195195
196196
197197
198
198
199199
200200
201201
......
209209
210210
211211
212
212
213213
214214
215215
......
219219
220220
221221
222
222
223223
224224
225225
......
253253
254254
255255
256
256
257257
258258
259259
......
268268
269269
270270
271
271
272272
273273
274274
......
285285
286286
287287
288
288
289289
290290
291291
......
313313
314314
315315
316
316
317317
318318
319319
......
393393
394394
395395
396
396
397397
398398
399399
......
432432
433433
434434
435
435
436436
437437
438438
......
465465
466466
467467
468
468
469469
470470
471471
......
486486
487487
488488
489
489
490490
491491
492492
cp -f ${pkgroot}/Scripts/Sub/InstallLog.sh ${1}/${choiceId}/Scripts
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
addChoice "${choiceId}" "start_visible=\"false\" start_selected=\"true\"" "$packageRefId"
# End build pre install package
ditto --noextattr --noqtn ${1%/*}/i386/bdmesg ${1}/${choiceId}/Root/usr/local/bin
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
addChoice "${choiceId}" "start_visible=\"false\" start_selected=\"true\"" "$packageRefId"
# End build core package
echo "" > "${1}/${choiceId}/Root/install_type_new"
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
addChoice "${choiceId}" "start_selected=\"!choices['Upgrade'].selected\" selected=\"${exclusiveChoice}\"" "$packageRefId"
# End build new install package
echo "" > "${1}/${choiceId}/Root/install_type_upgrade"
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
addChoice "${choiceId}" "start_selected=\"chameleon_boot_plist_exists()\" selected=\"${exclusiveChoice}\"" "$packageRefId"
# End build upgrade package
ditto --arch i386 `which SetFile` ${1}/${choiceId}/Scripts/Resources/SetFile
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
addChoice "${choiceId}" "start_selected=\"true\" selected=\"${exclusiveChoice}\"" "$packageRefId"
# End build standard package
ditto --arch i386 `which SetFile` ${1}/${choiceId}/Scripts/Resources/SetFile
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
addChoice "${choiceId}" "start_visible=\"systemHasGPT()\" start_selected=\"false\" selected=\"${exclusiveChoice}\"" "$packageRefId"
# End build efi package
mkdir -p ${1}/${choiceId}/Root
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
addChoice "${choiceId}" "start_selected=\"false\" selected=\"${exclusiveChoice}\"" "$packageRefId"
# End build no bootloader choice package
ditto --noextattr --noqtn ${1%/*}/i386/modules/${choiceId}.dylib ${1}/${choiceId}/Root
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
addChoice "${choiceId}" "start_selected=\"false\"" "$packageRefId"
# End build klibc package module
}
ditto --noextattr --noqtn ${1%/*}/i386/modules/uClibcxx.dylib ${1}/${choiceId}/Root
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
# Add the klibc package because the uClibc module is dependent of klibc module
addChoice "${choiceId}" "start_selected=\"false\"" \
"$packageRefId" $(getPackageRefId "${modules_packages_identity}" "klibc")
ditto --noextattr --noqtn ${1%/*}/i386/modules/Resolution.dylib ${1}/${choiceId}/Root
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
addChoice "${choiceId}" "start_selected=\"false\"" "$packageRefId"
# End build Resolution package module
}
ditto --noextattr --noqtn ${1%/*}/i386/cham-mklayout ${1}/${choiceId}/Root/usr/local/bin
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
# Don't add a choice for Keylayout module
# addChoice "${choiceId}" "start_selected=\"false\"" "$packageRefId"
echo -e "\t[BUILD] ${optionName} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}")
buildpackage "$packageRefId" "${optionName}" "${1}/${optionName}" "/$chamTemp/options" >/dev/null 2>&1
buildpackage "$packageRefId" "${optionName}" "${1}/${optionName}" "/$chamTemp/options" # >/dev/null 2>&1
exclusiveSelect=""
if [[ ${exclusiveFlag} -eq 1 ]];then
exclusiveSelect="selected=\"$(exclusive_zero_or_one_choice "$optionName" "$allChoices")\""
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/options" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/options" # >/dev/null 2>&1
exclusiveChoice=$(exclusive_zero_or_one_choice "$choiceId" "$allChoices")
# Add the Keylayout package because the Keylayout module is needed
addChoice "${choiceId}" "start_selected=\"false\" selected=\"${exclusiveChoice}\"" \
rsync -r --exclude=.svn "${themes[$i]}/" "${1}/${theme}/Root/${theme}"
echo -e "\t[BUILD] ${theme}"
packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}")
buildpackage "$packageRefId" "${theme}" "${1}/${theme}" "/$chamTemp/Extra/Themes" >/dev/null 2>&1
buildpackage "$packageRefId" "${theme}" "${1}/${theme}" "/$chamTemp/Extra/Themes" # >/dev/null 2>&1
addChoice "${theme}" "start_selected=\"false\"" "$packageRefId"
done
ditto --noextattr --noqtn ${1%/*/*}/version ${1}/${choiceId}/Scripts/Resources/version
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
addChoice "${choiceId}" "start_visible=\"false\" start_selected=\"true\"" "$packageRefId"
# End build post install package
branches/ErmaC/Trunk/CHANGES
55
66
77
8
9
10
11
12
813
914
1015
disabled by default: http://forum.voodooprojects.org/index.php/topic,2158.0.html
- Added exFAT volume label support (FAT64) support (credit to dmazar):
http://forum.voodooprojects.org/index.php/topic,2095.0.html
- disableIRQs() http://www.insanelymac.com/forum/index.php?s=&showtopic=255866&view=findpost&p=1677779
Port of original patch by: CPARM (who basically did this in boot.c) Thanks!
The ACPI specification dictates that the 8259 (PC-AT compatible) vectors
must be disabled (that is, masked) when enabling the ACPI APIC operation
but this isn't done (apparently) on all mobo's and thus we do that here.
- Added AtiPorts option to GraphicsEnabler, so users can override the default number of ports. It proved
to be useful when used to limit the number of ports that a framebuffer registers, which seems to be a
requirement on laptops that can only use 2 ports at the same time.
branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c
755755
756756
757757
758
759758
760759
760
761761
762762
763763
......
845845
846846
847847
848
848849
849
850850
851851
852852
......
10621062
10631063
10641064
1065
1065
10661066
10671067
10681068
......
10811081
10821082
10831083
1084
1084
10851085
10861086
10871087
......
12591259
12601260
12611261
1262
1262
12631263
12641264
1265
1266
12651267
12661268
1267
1269
12681270
12691271
12701272
{ 0x10DE0DC5, "GeForce GTS 450" },
{ 0x10DE0DC6, "GeForce GTS 450" },
{ 0x10DE0DCA, "GF10x" },
// 0DD0 - 0DDF
{ 0x10DE0DCD, "GeForce GT 555M" }, // ErmaC
{ 0x10DE0DCE, "GeForce GT 555M" }, // ErmaC
// 0DD0 - 0DDF
{ 0x10DE0DD1, "GeForce GTX 460M" },
{ 0x10DE0DD2, "GeForce GT 445M" },
{ 0x10DE0DD3, "GeForce GT 435M" },
{ 0x10DE1057, "NVS 4200M" }, // ErmaC
// 1060 - 106F
// 1070 - 107F
{ 0x10DE107F, "NVIDIA GF119-ES" }, // ErmaC
// 1080 - 108F
{ 0x10DE107F, "NVIDIA GF119-ES" }, // ErmaC
{ 0x10DE1080, "GeForce GTX 580" },
{ 0x10DE1081, "GeForce GTX 570" },
{ 0x10DE1082, "GeForce GTX 560 Ti" },
channel1 |= ( 0x1 << entries[i].index);
entries[i].type = TYPE_GROUPED;
if ((entries[i-1].type == 0x0))
if ( entries[i-1].type == 0x0 )
{
channel1 |= ( 0x1 << entries[i-1].index);
entries[i-1].type = TYPE_GROUPED;
channel2 |= ( 0x1 << entries[i].index);
entries[i].type = TYPE_GROUPED;
if ((entries[i - 1].type == 0x0))
if ( entries[i - 1].type == 0x0 )
{
channel2 |= ( 0x1 << entries[i-1].index);
entries[i-1].type = TYPE_GROUPED;
vram_size *= REG32(NVC0_MEM_CTRLR_COUNT);
}
// Workaround for GT 420/430 & 9600M GT
// Workaround for 9600M GT, GT 420/430/440 & GT 525M
switch (nvda_dev->device_id)
{
case 0x0649: vram_size = 512*1024*1024; break;// 9600M GT
case 0x0DE0: vram_size = 1024*1024*1024; break; // GT 440
case 0x0DE1: vram_size = 1024*1024*1024; break; // GT 430
case 0x0DE2: vram_size = 1024*1024*1024; break; // GT 420
case 0x0649: vram_size = 512*1024*1024; break;// 9600M GT
case 0x0DEC: vram_size = 1024*1024*1024; break; // GT 525M
default: break;
}
branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c
509509
510510
511511
512
512
513513
514514
515515
......
520520
521521
522522
523
523
524
524525
525526
526527
......
529530
530531
531532
532
533
534533
535534
536535
......
572571
573572
574573
575
574
576575
577576
578577
......
593592
594593
595594
596
595
597596
598
597
599598
600599
601600
......
620619
621620
622621
623
622
624623
625
624
626625
627626
628627
629628
630629
631
630
631
632632
633633
634634
......
647647
648648
649649
650
650651
651652
652653
......
680681
681682
682683
683
684
685
684686
685687
686688
......
757759
758760
759761
760
762
761763
762764
763765
764766
765767
768
766769
767770
768771
......
773776
774777
775778
776
779
777780
778781
779782
{ 0x689C,0x30201682, CHIP_FAMILY_HEMLOCK,"ATI Radeon HD 5970",kUakari, 0 },
{ 0x68A0,0x043A1028,CHIP_FAMILY_BROADWAY,"ATI Mobility Radeon HD 5870",kNull, 0 }, // ErmaC
{ 0x68A0,0x043A1028,CHIP_FAMILY_BROADWAY,"ATI Mobility Radeon HD 5870",kNomascus, 0 }, // ErmaC
{ 0x68A1,0x144D103C,CHIP_FAMILY_CYPRESS,"ATI Mobility Radeon HD 5850",kNomascus, 0 },
{ 0x68A1,0x1522103C, CHIP_FAMILY_CYPRESS,"ATI Mobility Radeon HD 5850",kHoolock, 0 },
{ 0x68B8,0x00CF106B, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 5770",kHoolock, 0 },
{ 0x68B8,0x21f61458, CHIP_FAMILY_JUNIPER,"GigaByte HD5770 R577SL-1GD",kVervet, 0 }, // ErmaC
{ 0x68B8,0x21D71458, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 5770",kVervet, 0 },
{ 0x68B8,0x21F61458, CHIP_FAMILY_JUNIPER,"GigaByte HD5770 R577SL-1GD",kVervet, 0 }, // ErmaC
{ 0x68B8,0x29901682, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 5770",kVervet, 0 },
{ 0x68B8,0x29911682, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 5770",kVervet, 0 },
{ 0x68B8,0xE144174B, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 5770",kHoolock, 0 }, // ErmaC
{ 0x68B8,0xE147174B, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 5770",kVervet, 0 },
{ 0x68B8,0x21D71458, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 5770",kVervet, 0 },
{ 0x68B8,0x200A1787, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 5770",kVervet, 0 }, // ErmaC
{ 0x68B8,0x200B1787, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 5770",kVervet, 0 },
{ 0x68B8,0x22881787, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 5770",kVervet, 0 },
{ 0x68D8,0x5690174B, CHIP_FAMILY_REDWOOD,"ATI Radeon HD 5690",kNull, 0 },
{ 0x68D8,0x5730174B, CHIP_FAMILY_REDWOOD,"ATI Radeon HD 5730",kNull, 0 },
{ 0x68D8,0xE151174B, CHIP_FAMILY_REDWOOD,"ATI Radeon HD 5670",kBaboon, 0 },
{ 0x68D8,0xE151174B, CHIP_FAMILY_REDWOOD,"ATI Radeon HD 5670",kEulemur, 0 },
{ 0x68D8,0x30001787, CHIP_FAMILY_REDWOOD,"ATI Radeon HD 5730",kNull, 0 },
{ 0x68E1,0x1426103C, CHIP_FAMILY_CEDAR,"ATI Radeon HD 5430M",kEulemur, 0 },
{ 0x68F9,0x010E1002, CHIP_FAMILY_CEDAR,"ATI Radeon HD 5450",kNull, 0 }, // ErmaC
{ 0x68F9,0x010E1002, CHIP_FAMILY_CEDAR,"ATI Radeon HD 5450",kEulemur, 0 }, // ErmaC
{ 0x68F9,0x03741043, CHIP_FAMILY_CEDAR,"ASUS EAH5450", kNull, 0 }, // ErmaC
{ 0x68F9,0x03741043, CHIP_FAMILY_CEDAR,"ASUS EAH5450", kEulemur, 0 }, // ErmaC
{ 0x68F9,0x5470174B, CHIP_FAMILY_CEDAR,"ATI Radeon HD 5470",kNull, 0 },
{ 0x68F9,0x5490174B, CHIP_FAMILY_CEDAR,"ATI Radeon HD 5490",kNull, 0 },
{ 0x6718,0x67181002, CHIP_FAMILY_CAYMAN,"AMD Radeon HD 6970",kNull, 0 },
{ 0x6718,0x31301682, CHIP_FAMILY_CAYMAN,"AMD Radeon HD 6970",kNull, 0 },
{ 0x6719,0x0B001002, CHIP_FAMILY_CAYMAN,"AMD Radeon HD 6950",kNull, 0 }, // ErmaC
{ 0x6719,0x0B001002, CHIP_FAMILY_CAYMAN,"AMD Radeon HD 6950",kGibba, 0 }, // ErmaC
{ 0x6719,0x186B174B, CHIP_FAMILY_CAYMAN,"AMD Radeon HD 6950",kNull, 0 }, // ErmaC
{ 0x6719,0x20101787, CHIP_FAMILY_CAYMAN,"AMD Radeon HD 6970",kNull, 0 }, // ErmaC
{ 0x6719,0x20101787, CHIP_FAMILY_CAYMAN,"AMD Radeon HD 6950",kGibba, 0 }, // ErmaC
{ 0x671D,0x10020B2A, CHIP_FAMILY_ANTILLES,"AMD Radeon HD 6990",kNull, 0 }, // ErmaC
{ 0x671D,0x10021B2A, CHIP_FAMILY_ANTILLES,"AMD Radeon HD 6990",kNull, 0 }, // ErmaC
{ 0x671D,0x16823160, CHIP_FAMILY_ANTILLES,"AMD Radeon HD 6990",kNull, 0 }, // ErmaC
{ 0x6720,0x04BA1028, CHIP_FAMILY_BARTS,"AMD Radeon HD 6970m",kElodea, 0 }, // ErmaC
{ 0x6720,0x04901028, CHIP_FAMILY_BARTS,"AMD Radeon HD 6970M",kNull, 0 }, // ErmaC
{ 0x6720,0x04BA1028, CHIP_FAMILY_BARTS,"AMD Radeon HD 6970M",kElodea, 0 }, // ErmaC
{ 0x6738,0x00D01002, CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed, 0 },
{ 0x6738,0x174B174B, CHIP_FAMILY_BARTS,"Sapphire Radeon HD6870",kBulrushes, 0 }, // ErmaC
{ 0x6738,0x20101787, CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed, 0 },
{ 0x6738,0x23051787, CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed, 0 },
{ 0x6739,0xAA881002, CHIP_FAMILY_BARTS,"AMD Radeon HD 6850",kDuckweed, 0 },
{ 0x6739,0x03B41043, CHIP_FAMILY_BARTS,"AMD Radeon HD 6850",kDuckweed, 0 }, // ErmaC
{ 0x6739,0x21F81458, CHIP_FAMILY_BARTS,"AMD Radeon HD 6850",kBulrushes, 0 }, // ErmaC
{ 0x6739,0x24411462, CHIP_FAMILY_BARTS,"AMD Radeon HD 6850",kDuckweed, 0 },
{ 0x6760,0x04CC1028, CHIP_FAMILY_CAICOS,"AMD Radeon HD 6490M",kNull, 0 },
{ 0x6760,0x167D103C, CHIP_FAMILY_CAICOS,"AMD Radeon HD 6490M",kNull, 0 }, // ErmaC
{ 0x6760,0x165A103C, CHIP_FAMILY_CAICOS,"AMD Radeon HD 6470M",kNull, 0 },
{ 0x6760,0x167D103C, CHIP_FAMILY_CAICOS,"AMD Radeon HD 6470M",kNull, 0 }, // ErmaC
{ 0x6760,0x1CB21043, CHIP_FAMILY_CAICOS,"AMD Radeon HD 6470M",kNull, 0 },
{ 0x689C,0x00000000, CHIP_FAMILY_HEMLOCK,"ATI Radeon HD 5900 Series",kUakari, 0 },
{ 0x689E,0x00000000, CHIP_FAMILY_CYPRESS,"ATI Radeon HD 5800 Series",kUakari, 0 },
{ 0x68A0,0x00000000, CHIP_FAMILY_BROADWAY,"ATI Mobility Radeon HD 5800 Series",kNull, 0 }, // ErmaC
{ 0x68A0,0x00000000, CHIP_FAMILY_BROADWAY,"ATI Mobility Radeon HD 5800 Series",kNomascus, 0 }, // ErmaC
{ 0x68A1,0x00000000, CHIP_FAMILY_BROADWAY,"ATI Mobility Radeon HD 5800 Series",kNull, 0 }, // ErmaC
{ 0x68B0,0x00000000, CHIP_FAMILY_BROADWAY,"ATI Mobility Radeon HD 5800 Series",kNull, 0 }, // ErmaC
{ 0x68B8,0x00000000, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 5700 Series",kVervet, 0 },
{ 0x68B9,0x00000000, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 5600 Series",kVervet, 0 },
{ 0x68BA,0x00000000, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 6770 Series",kVervet, 0 },
{ 0x68BE,0x00000000, CHIP_FAMILY_JUNIPER,"ATI Radeon HD 5700 Series",kVervet, 0 },
{ 0x68D8,0x00000000, CHIP_FAMILY_REDWOOD,"ATI Radeon HD 5600 Series",kBaboon, 0 },
/* Northen Islands */
{ 0x6718,0x00000000, CHIP_FAMILY_CAYMAN,"AMD Radeon HD 6970 Series",kNull, 0 },
{ 0x6719,0x00000000, CHIP_FAMILY_CAYMAN,"AMD Radeon HD 6950 Series",kNull, 0 },
{ 0x6719,0x00000000, CHIP_FAMILY_CAYMAN,"AMD Radeon HD 6950 Series",kGibba, 0 },
{ 0x671D,0x00000000, CHIP_FAMILY_ANTILLES,"AMD Radeon HD 6900 Series",kNull, 0 }, // ErmaC
{ 0x671F,0x00000000, CHIP_FAMILY_CAYMAN,"AMD Radeon HD 6900 Series",kNull, 0 }, // ErmaC
branches/ErmaC/Modules/package/Changes.txt
1
1
22
3
4
5
6
7
8
9
10
11
12
13
14
15
16
317
418
519
......
4458
4559
4660
47
61
- Keylayout / Keymaps fixed and made a mandatory install.
- Change Localizable.strings to match the recent changes to the install process.
- Improve messages written to the installation log.
- Change upgrade install to only backup /Extra folder if necessary.
- JrCs - Enhanced installer - We can add an option without an associated package - We can have an option that install
multiple packages - No more "fake" option (none) - The package that is build is already compressed (no need to
compress it again)
- JrCs - Update postinstall script - Fix a bug where kernel flags are not set properly - Fix indent - Add some comments.
- JrCs - Automaticaly select upgrade option if /Extra/org.chameleon.Boot.plist file exists on the target volume.
- JrCs - Keylayout / Keymaps fixed and made a mandatory install when a keymap is chosen.
- Add option to upgrade an existing install - or more exactly, merge newly selected options with an existing /Extra folder. Also, rename an existing /Extra/com.apple.Boot.plist to /Extra/org.chameleon.Boot.plist.
- Change the layout/wording displayed in the installer (English only) and give it a facelift. Adjust background image to scale to fit in the window.
- slimpkg.sh changed to match the revised code in buildpkg.sh where applicable.
- English Localizable.strings revised to match latest additions and some texts updated.
- English Localizable.strings revised to match latest additions and some texts updated.
branches/ErmaC/Modules/package/buildpkg.sh
117117
118118
119119
120
120
121121
122122
123123
......
140140
141141
142142
143
143
144144
145145
146146
......
158158
159159
160160
161
161
162162
163163
164164
......
169169
170170
171171
172
172
173173
174174
175175
......
195195
196196
197197
198
198
199199
200200
201201
......
209209
210210
211211
212
212
213213
214214
215215
......
219219
220220
221221
222
222
223223
224224
225225
......
257257
258258
259259
260
260
261261
262262
263263
......
272272
273273
274274
275
275
276276
277277
278278
......
289289
290290
291291
292
292
293293
294294
295295
......
317317
318318
319319
320
320
321321
322322
323323
......
335335
336336
337337
338
338
339339
340340
341341
......
351351
352352
353353
354
354
355355
356356
357357
......
367367
368368
369369
370
370
371371
372372
373373
......
383383
384384
385385
386
386
387387
388388
389389
......
461461
462462
463463
464
464
465465
466466
467467
......
500500
501501
502502
503
503
504504
505505
506506
......
533533
534534
535535
536
536
537537
538538
539539
......
554554
555555
556556
557
557
558558
559559
560560
cp -f ${pkgroot}/Scripts/Sub/InstallLog.sh ${1}/${choiceId}/Scripts
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
addChoice "${choiceId}" "start_visible=\"false\" start_selected=\"true\"" "$packageRefId"
# End build pre install package
ditto --noextattr --noqtn ${1%/*}/i386/bdmesg ${1}/${choiceId}/Root/usr/local/bin
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
addChoice "${choiceId}" "start_visible=\"false\" start_selected=\"true\"" "$packageRefId"
# End build core package
echo "" > "${1}/${choiceId}/Root/install_type_new"
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
addChoice "${choiceId}" "start_selected=\"!choices['Upgrade'].selected\" selected=\"${exclusiveChoice}\"" "$packageRefId"
# End build new install package
echo "" > "${1}/${choiceId}/Root/install_type_upgrade"
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
addChoice "${choiceId}" "start_selected=\"chameleon_boot_plist_exists()\" selected=\"${exclusiveChoice}\"" "$packageRefId"
# End build upgrade package
ditto --arch i386 `which SetFile` ${1}/${choiceId}/Scripts/Resources/SetFile
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
addChoice "${choiceId}" "start_selected=\"true\" selected=\"${exclusiveChoice}\"" "$packageRefId"
# End build standard package
ditto --arch i386 `which SetFile` ${1}/${choiceId}/Scripts/Resources/SetFile
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
addChoice "${choiceId}" "start_visible=\"systemHasGPT()\" start_selected=\"false\" selected=\"${exclusiveChoice}\"" "$packageRefId"
# End build efi package
mkdir -p ${1}/${choiceId}/Root
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
addChoice "${choiceId}" "start_selected=\"false\" selected=\"${exclusiveChoice}\"" "$packageRefId"
# End build no bootloader choice package
ditto --noextattr --noqtn ${1%/*}/i386/modules/${choiceId}.dylib ${1}/${choiceId}/Root
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
addChoice "${choiceId}" "start_selected=\"false\"" "$packageRefId"
# End build klibc package module
}
ditto --noextattr --noqtn ${1%/*}/i386/modules/uClibcxx.dylib ${1}/${choiceId}/Root
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
# Add the klibc package because the uClibc module is dependent of klibc module
addChoice "${choiceId}" "start_selected=\"false\"" \
"$packageRefId" $(getPackageRefId "${modules_packages_identity}" "klibc")
ditto --noextattr --noqtn ${1%/*}/i386/modules/Resolution.dylib ${1}/${choiceId}/Root
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
addChoice "${choiceId}" "start_selected=\"false\"" "$packageRefId"
# End build Resolution package module
}
ditto --noextattr --noqtn ${1%/*}/i386/cham-mklayout ${1}/${choiceId}/Root/usr/local/bin
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
# Don't add a choice for Keylayout module
# addChoice "${choiceId}" "start_selected=\"false\"" "$packageRefId"
ditto --noextattr --noqtn ${1%/*}/i386/modules/AMDGraphicsEnabler.dylib ${1}/${choiceId}/Root
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
addChoice "${choiceId}" "start_selected=\"false\"" "$packageRefId"
# End build AMDGraphicsEnabler package module
}
ditto --noextattr --noqtn ${1%/*}/i386/modules/ATiGraphicsEnabler.dylib ${1}/${choiceId}/Root
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
addChoice "${choiceId}" "start_selected=\"false\"" "$packageRefId"
# End build ATiGraphicsEnabler package module
}
ditto --noextattr --noqtn ${1%/*}/i386/modules/IntelGraphicsEnabler.dylib ${1}/${choiceId}/Root
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
addChoice "${choiceId}" "start_selected=\"false\"" "$packageRefId"
# End build IntelGraphicsEnabler package module
}
ditto --noextattr --noqtn ${1%/*}/i386/modules/NVIDIAGraphicsEnabler.dylib ${1}/${choiceId}/Root
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
addChoice "${choiceId}" "start_selected=\"false\"" "$packageRefId"
# End build NVIDIAGraphicsEnabler package module
}
echo -e "\t[BUILD] ${optionName} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}")
buildpackage "$packageRefId" "${optionName}" "${1}/${optionName}" "/$chamTemp/options" >/dev/null 2>&1
buildpackage "$packageRefId" "${optionName}" "${1}/${optionName}" "/$chamTemp/options" # >/dev/null 2>&1
exclusiveSelect=""
if [[ ${exclusiveFlag} -eq 1 ]];then
exclusiveSelect="selected=\"$(exclusive_zero_or_one_choice "$optionName" "$allChoices")\""
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/options" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/options" # >/dev/null 2>&1
exclusiveChoice=$(exclusive_zero_or_one_choice "$choiceId" "$allChoices")
# Add the Keylayout package because the Keylayout module is needed
addChoice "${choiceId}" "start_selected=\"false\" selected=\"${exclusiveChoice}\"" \
rsync -r --exclude=.svn "${themes[$i]}/" "${1}/${theme}/Root/${theme}"
echo -e "\t[BUILD] ${theme}"
packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}")
buildpackage "$packageRefId" "${theme}" "${1}/${theme}" "/$chamTemp/Extra/Themes" >/dev/null 2>&1
buildpackage "$packageRefId" "${theme}" "${1}/${theme}" "/$chamTemp/Extra/Themes" # >/dev/null 2>&1
addChoice "${theme}" "start_selected=\"false\"" "$packageRefId"
done
ditto --noextattr --noqtn ${1%/*/*}/version ${1}/${choiceId}/Scripts/Resources/version
echo -e "\t[BUILD] ${choiceId} "
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
addChoice "${choiceId}" "start_visible=\"false\" start_selected=\"true\"" "$packageRefId"
# End build post install package
branches/ErmaC/Modules/CHANGES
55
66
77
8
9
10
11
12
813
914
1015
disabled by default: http://forum.voodooprojects.org/index.php/topic,2158.0.html
- Added exFAT volume label support (FAT64) support (credit to dmazar):
http://forum.voodooprojects.org/index.php/topic,2095.0.html
- disableIRQs() http://www.insanelymac.com/forum/index.php?s=&showtopic=255866&view=findpost&p=1677779
Port of original patch by: CPARM (who basically did this in boot.c) Thanks!
The ACPI specification dictates that the 8259 (PC-AT compatible) vectors
must be disabled (that is, masked) when enabling the ACPI APIC operation
but this isn't done (apparently) on all mobo's and thus we do that here.
- Added AtiPorts option to GraphicsEnabler, so users can override the default number of ports. It proved
to be useful when used to limit the number of ports that a framebuffer registers, which seems to be a
requirement on laptops that can only use 2 ports at the same time.

Archive Download the corresponding diff file

Revision: 1755