Index: branches/ErmaC/i386/libsaio/smbios_getters.c
===================================================================
--- branches/ErmaC/i386/libsaio/smbios_getters.c (revision 1497)
+++ branches/ErmaC/i386/libsaio/smbios_getters.c (revision 1498)
@@ -21,7 +21,35 @@
bool getProcessorInformationExternalClock(returnType *value)
{
- value->word = Platform.CPU.FSBFrequency/1000000;
+ if (Platform.CPU.Vendor == CPUID_VENDOR_INTEL) // Intel
+ {
+ switch (Platform.CPU.Family)
+ {
+ case 0x06:
+ {
+ switch (Platform.CPU.Model)
+ {
+ // set external clock to 0 for SANDY
+ // removes FSB info from system profiler as on real mac's.
+ case CPU_MODEL_SANDY_XEON:
+ case CPU_MODEL_SANDY:
+ value->word = 0;
+ break;
+ default:
+ value->word = Platform.CPU.FSBFrequency/1000000;
+ }
+ }
+ break;
+
+ default:
+ value->word = Platform.CPU.FSBFrequency/1000000;
+ }
+ }
+ else
+ {
+ value->word = Platform.CPU.FSBFrequency/1000000;
+ }
+
return true;
}
@@ -33,7 +61,7 @@
bool getSMBOemProcessorBusSpeed(returnType *value)
{
- if (Platform.CPU.Vendor == 0x756E6547) // Intel
+ if (Platform.CPU.Vendor == CPUID_VENDOR_INTEL) // Intel
{
switch (Platform.CPU.Family)
{
@@ -113,7 +141,7 @@
value->word = simpleGetSMBOemProcessorType();
- if (Platform.CPU.Vendor == 0x756E6547) // Intel
+ if (Platform.CPU.Vendor == CPUID_VENDOR_INTEL) // Intel
{
if (!done)
{
Index: branches/ErmaC/i386/boot0/boot0.s
===================================================================
--- branches/ErmaC/i386/boot0/boot0.s (revision 1497)
+++ branches/ErmaC/i386/boot0/boot0.s (revision 1498)
@@ -60,6 +60,11 @@
VERBOSE EQU CONFIG_BOOT0_VERBOSE
;
+; Set to 1 to enable unstretch mode
+;
+UNSTRETCH EQU CONFIG_BOOT0_UNSTRETCH
+
+;
; Various constants.
;
kBoot0Segment EQU 0x0000
@@ -230,6 +235,10 @@
call print_hex
%endif
+%if UNSTRETCH
+ call disable_scaler
+%endif
+
;
; Since this code may not always reside in the MBR, always start by
; loading the MBR to kMBRBuffer and LBA1 to kGPTBuffer.
@@ -758,6 +767,19 @@
ret
%endif ;DEBUG
+%if UNSTRETCH
+;--------------------------------------------------------------------------
+; Disable On-Chip Scaling for nVidia Cards
+;
+disable_scaler:
+ mov ax,4F14h ;VESA VBE OEM function
+ mov bl,2 ;Subfunction 02 = Set Panel Expansion/Centering
+ mov bh,1 ;00 = Return Current Setting, 01 = Set Centering/Expansion
+ mov cx,0001h ;Exp. mode: 00 = Scaled, 01 = Centered 1:1, 02 = Left Corner 1:1
+ int 10h ;call VGA/VBE service
+ LogString(nv_scaler_str)
+ ret
+%endif
;--------------------------------------------------------------------------
; NULL terminated strings.
@@ -765,6 +787,10 @@
log_title_str db 10, 13, 'boot0: ', 0
boot_error_str db 'error', 0
+%if UNSTRETCH
+nv_scaler_str db 'Unstretch', 0
+%endif ;DEBUG
+
%if VERBOSE
gpt_str db 'GPT', 0
test_str db 'test', 0
Index: branches/ErmaC/i386/boot0/Cconfig
===================================================================
--- branches/ErmaC/i386/boot0/Cconfig (revision 1497)
+++ branches/ErmaC/i386/boot0/Cconfig (revision 1498)
@@ -12,9 +12,18 @@
config BOOT0_VERBOSE
bool "boot0 verbose support"
- default y
+ default n
help
Say Y here if you want to enable boot0 verbose messages.
boot0 will print out status updates as it executes to
notify the user of progress in the initial boot sequence.
When in doubt, say "Y".
+
+config BOOT0_UNSTRETCH
+ bool "boot0 unstretch support"
+ default y
+ help
+ Say Y here if you want your Chameleon Boot Screen to be
+ unstretched. Requires a nVidia card, and a digital LCD
+ connected via DVI.
+ When in doubt, say "Y".
Index: branches/ErmaC/i386/modules/MakeInc.dir
===================================================================
--- branches/ErmaC/i386/modules/MakeInc.dir (revision 1497)
+++ branches/ErmaC/i386/modules/MakeInc.dir (revision 1498)
@@ -72,6 +72,7 @@
# Make this as a *MODULE*
all: dylib
+ @for d in $(SUBDIRS); do (cd $$d; $(MAKE) $@ ); done
else
# Module not selected to be compiled as a module
@@ -86,6 +87,7 @@
# Make this *BUILT IN*
all: dylib_LINKER
+ @for d in $(SUBDIRS); do (cd $$d; $(MAKE) $@ ); done
else
# Module not selected to be built in
@@ -146,6 +148,7 @@
clean:
+ @for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@ ); done
@echo "\t[RM] $(SYMROOT)/modules/$(MODULE_NAME).dylib"
@echo "\t[RM] $(OBJROOT)"
@echo "\t[RM] $(DSTROOT)"
@@ -177,4 +180,4 @@
@echo "$(MODULE_DESCRIPTION)" > $@
#dependencies
--include $(OBJROOT)/Makedep
\ No newline at end of file
+-include $(OBJROOT)/Makedep
Index: branches/ErmaC/i386/modules/Makefile
===================================================================
--- branches/ErmaC/i386/modules/Makefile (revision 1497)
+++ branches/ErmaC/i386/modules/Makefile (revision 1498)
@@ -10,10 +10,25 @@
include ${SRCROOT}/Make.rules
-# The order of building is important.
-SUBDIRS = klibc uClibcxx Resolution HelloWorld
+# The order of building modules is important.
+SUBDIRS =
+ifdef CONFIG_KLIBC_MODULE
+SUBDIRS += klibc
+endif
+ifdef CONFIG_UCLIBCXX_MODULE
+SUBDIRS += uClibcxx
+endif
+
+ifdef CONFIG_RESOLUTION_MODULE
+SUBDIRS += Resolution
+endif
+
+ifdef CONFIG_HELLOWORLD_MODULE
+SUBDIRS += HelloWorld
+endif
+
CFLAGS= -O3 $(MORECPP) -arch i386 -g -static
DEFINES=
CONFIG = hd
Index: branches/ErmaC/package/Scripts/Standard/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Standard/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Standard/postinstall (revision 1498)
@@ -1,5 +1,6 @@
#!/bin/bash
+
diskloader="boot0"
diskloaderdualboot="boot0md"
partitionloaderhfs="boot1h"
@@ -234,7 +235,7 @@
efiformat="hfs"
fi
if [ "$( fstyp ${bootdev} | grep msdos )" ]; then
- echo "${bootdev} is currently formatted as msdos" #Azipkg: hum... it's not really msdos, but ok...
+ echo "${bootdev} is currently formatted as msdos"
efiformat="msdos"
fi
echo "-----------------------------------------------"
@@ -291,13 +292,13 @@
if [ ${disksignature} == "00000000" ]; then
echo "Executing command: fdisk440 -u -f /usr/standalone/i386/${diskloader} -y ${bootdisk}"
- fdisk440 -u -f "${bootvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk}
+ "${bootresources}/Tools/fdisk440" -u -f "${bootvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk}
else
#---------------------------------------------------------------------
# If it exists then Windows is also installed on the HDD and we need to write boot0hfs
#---------------------------------------------------------------------
echo "Executing command: fdisk440 -u -f /usr/standalone/i386/${diskloaderdualboot} -y ${bootdisk}"
- fdisk440 -u -f "${bootvolume}/usr/standalone/i386/${diskloaderdualboot}" -y ${bootdisk}
+ "${bootresources}/Tools/fdisk440" -u -f "${bootvolume}/usr/standalone/i386/${diskloaderdualboot}" -y ${bootdisk}
fi
else
echo "Diskupdate is false, so no stage 0 file was written"
@@ -310,18 +311,14 @@
if [ ${efiformat} = "msdos" ]; then
echo "Executing command: dd if=/usr/standalone/i386/${partitionloaderfat} of=${bootrdev}"
- #Azipkg: just like this??... no preparation???
dd if="${bootvolume}/usr/standalone/i386/${partitionloaderfat}" of=${bootrdev}
fi
echo "Executing command: cp /usr/standalone/i386/${filesystemloader} ${bootvolume}"
cp "${bootvolume}/usr/standalone/i386/${filesystemloader}" "${bootvolume}"
-#Azipkg: at this point, we don't know if the user has setfile installed...
-# and it looks like it's not found on "booteresources" ???
-# do we really want to hide "boot"?... i never do...! IS THIS DONE HERE ??? SEE AT THE END OF THE FILE...
-#echo "Executing command: ${bootresources}/Tools/SetFile -a V ${bootvolume}/${filesystemloader}"
-#"${bootresources}/Tools/SetFile" -a V "${bootvolume}/${filesystemloader}"
+echo "Executing command: ${bootresources}/Tools/SetFile -a V ${bootvolume}/${filesystemloader}"
+"${bootresources}/Tools/SetFile" -a V "${bootvolume}/${filesystemloader}"
echo "-----------------------------------------------"
echo ""
@@ -332,11 +329,10 @@
echo "Set Active Partition ONLY if Windows is not installed"
echo "*****************************************************"
-#Azipkg: works for EFI, but does it work for other GPT partitions?... check, was under the impression that NO??!
if [ ${disksignature} == "00000000" ]; then
# echo "Windows is not installed so let's change the active partition"
- partitionactive=$( fdisk440 -d ${bootrdisk} | grep -n "*" | awk -F: '{print $1}')
+ partitionactive=$( "${bootresources}/Tools/fdisk440" -d ${bootrdisk} | grep -n "*" | awk -F: '{print $1}')
echo "Current Active Partition: ${partitionactive}"
if [ "${partitionactive}" = "${bootslice}" ]; then
@@ -346,7 +342,7 @@
# BadAxe requires EFI partition to be flagged active.
# but it doesn't' hurt to do it for any non-windows partition.
- fdisk440 -e ${bootrdisk} <<-MAKEACTIVE
+ "${bootresources}/Tools/fdisk440" -e ${bootrdisk} <<-MAKEACTIVE
print
flag ${bootslice}
write
@@ -362,7 +358,6 @@
echo ""
# hide boot file
-#Azipkg: do we really want to hide "boot"?... i never do...
chflags hidden "${3}/boot"
echo "boot file hidden ${3}/boot"
Index: branches/ErmaC/package/Scripts/EFI/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/EFI/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/EFI/postinstall (revision 1498)
@@ -63,6 +63,7 @@
echo ""
echo ""
+
bootvolume="/Volumes/$bootervolumename"
bootdev=${bootdev%s*}s1
bootrdev=${bootdev/disk/rdisk}
@@ -244,7 +245,7 @@
}
-} #Azipkg: ???
+}
start ${3}
@@ -271,7 +272,7 @@
efiformat="hfs"
fi
if [ "$( fstyp ${bootdev} | grep msdos )" ]; then
- echo "${bootdev} is currently formatted as msdos" #Azipkg: hum... it's not really msdos, but ok...
+ echo "${bootdev} is currently formatted as msdos"
efiformat="msdos"
fi
echo "-----------------------------------------------"
@@ -372,7 +373,6 @@
# MAKEACTIVE
#fi
-#Azipkg: works for EFI, but does it work for other GPT partitions?... check, was under the impression that NO??!
if [ ${disksignature} == "00000000" ]; then
# echo "Windows is not installed so let's change the active partition"
@@ -407,7 +407,7 @@
#checkpartitionbootcode check
#checkpartitionactive
-#Azipkg: this forces the user to unmount the EFI part via terminal --> sudo umount /volumes/efi...?!
+
echo "==============================================="
echo "Mount EFI partition:"
echo "********************"
@@ -432,7 +432,6 @@
echo "Executing command: cp "${osxvolume}/usr/standalone/i386/${filesystemloader}" ${bootvolume}/boot"
cp "${osxvolume}/usr/standalone/i386/${filesystemloader}" "${bootvolume}/boot"
echo "boot written"
-#Azipkg: we're still missing copy Extra folder into EFI, else no themes & modules...???
echo "-----------------------------------------------"
echo ""
Index: branches/ErmaC/package/Scripts/Advanced/ForceHPET/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/ForceHPET/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/ForceHPET/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if ForceHPET has been written or not
ForceHPETCheck = False
Index: branches/ErmaC/package/Scripts/Advanced/EHCIacquire/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/EHCIacquire/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/EHCIacquire/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if EHCIacquire has been written or not
EHCIacquireCheck = False
Index: branches/ErmaC/package/Scripts/Advanced/VBIOS/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/VBIOS/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/VBIOS/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if VBIOS has been written or not
VBIOSCheck = False
Index: branches/ErmaC/package/Scripts/Advanced/GUI/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/GUI/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/GUI/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if GUI has been written or not
GUICheck = False
@@ -27,4 +31,4 @@
outfile = open(plist, "w")
outfile.write(body)
-outfile.close()
\ No newline at end of file
+outfile.close()
Index: branches/ErmaC/package/Scripts/Advanced/SMBIOSdefaults/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/SMBIOSdefaults/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/SMBIOSdefaults/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if SMBIOSdefault has been written or not
SMBIOSdefaultCheck = False
Index: branches/ErmaC/package/Scripts/Advanced/UseMemDetect/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/UseMemDetect/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/UseMemDetect/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if UseMemDetect has been written or not
UseMemDetectCheck = False
Index: branches/ErmaC/package/Scripts/Advanced/LegacyLogo/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/LegacyLogo/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/LegacyLogo/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if LegacyLogo has been written or not
LegacyLogoCheck = False
@@ -16,7 +20,7 @@
for line in infile:
# if we finish the tags and haven't written LegacyLogo Yet
if "" in line and LegacyLogoCheck == False:
- line = " LegacyLogo\n"
+ line = " Legacy Logo\n"
line += " Yes\n"
line += "\n"
LegacyLogoCheck = True
Index: branches/ErmaC/package/Scripts/Advanced/Wake/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/Wake/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/Wake/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Wake has been written or not
WakeCheck = False
Index: branches/ErmaC/package/Scripts/Advanced/BootBanner/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/BootBanner/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/BootBanner/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if BootBanner has been written or not
BootBannerCheck = False
@@ -16,7 +20,7 @@
for line in infile:
# if we finish the tags and haven't written BootBanner Yet
if "" in line and BootBannerCheck == False:
- line = " BootBanner\n"
+ line = " Boot Banner\n"
line += " No\n"
line += "\n"
BootBannerCheck = True
Index: branches/ErmaC/package/Scripts/Advanced/Npci/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/Npci/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/Npci/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Kernel Flags has been written or not
KernelFlagsCheck = False
Index: branches/ErmaC/package/Scripts/Advanced/UHCIreset/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/UHCIreset/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/UHCIreset/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if UHCIreset has been written or not
UHCIresetCheck = False
Index: branches/ErmaC/package/Scripts/Advanced/ShowInfo/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/ShowInfo/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/ShowInfo/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if ShowInfo has been written or not
ShowInfoCheck = False
@@ -27,4 +31,4 @@
outfile = open(plist, "w")
outfile.write(body)
-outfile.close()
\ No newline at end of file
+outfile.close()
Index: branches/ErmaC/package/Scripts/Advanced/Wait/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/Wait/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/Wait/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Wait has been written or not
WaitCheck = False
Index: branches/ErmaC/package/Scripts/Advanced/UseNvidiaROM/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/UseNvidiaROM/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/UseNvidiaROM/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if UseNvidiaROM has been written or not
UseNvidiaROMCheck = False
Index: branches/ErmaC/package/Scripts/Advanced/ForceWake/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/ForceWake/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/ForceWake/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if ForceWake has been written or not
ForceWakeCheck = False
Index: branches/ErmaC/package/Scripts/Advanced/UseAtiROM/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/UseAtiROM/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/UseAtiROM/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if UseAtiROM has been written or not
UseAtiROMCheck = False
Index: branches/ErmaC/package/Scripts/Advanced/QuietBoot/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Advanced/QuietBoot/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Advanced/QuietBoot/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if QuietBoot has been written or not
QuietBootCheck = False
Index: branches/ErmaC/package/Scripts/Post/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Post/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Post/postinstall (revision 1498)
@@ -35,6 +35,6 @@
# delete the temporary Chameleon folder
-rm -rf "$dest_vol/tmpcham" #Azipkg: were's this? sandbox???
+rm -rf "$dest_vol/tmpcham"
echo "Done..."
Index: branches/ErmaC/package/Scripts/BaseOptions/GenerateCStates/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/BaseOptions/GenerateCStates/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/BaseOptions/GenerateCStates/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if GenerateCStates has been written or not
GenerateCStatesCheck = False
Index: branches/ErmaC/package/Scripts/BaseOptions/DropSSDT/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/BaseOptions/DropSSDT/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/BaseOptions/DropSSDT/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if DropSSDT has been written or not
DropSSDTCheck = False
Index: branches/ErmaC/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if EthernetBuiltIn has been written or not
EthernetBuiltInCheck = False
Index: branches/ErmaC/package/Scripts/BaseOptions/InstantMenu/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/BaseOptions/InstantMenu/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/BaseOptions/InstantMenu/postinstall (revision 1498)
@@ -4,10 +4,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Instant Menu has been written or not
InstantMenuCheck = False
Index: branches/ErmaC/package/Scripts/BaseOptions/GraphicsEnabler/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/BaseOptions/GraphicsEnabler/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/BaseOptions/GraphicsEnabler/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if GraphicsEnabler has been written or not
GraphicsEnablerCheck = False
Index: branches/ErmaC/package/Scripts/BaseOptions/RestartFix/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/BaseOptions/RestartFix/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/BaseOptions/RestartFix/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if RestartFix has been written or not
RestartFixCheck = False
Index: branches/ErmaC/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if CSTUsingSystemIO has been written or not
CSTUsingSystemIOCheck = False
Index: branches/ErmaC/package/Scripts/BaseOptions/EnableC2State/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/BaseOptions/EnableC2State/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/BaseOptions/EnableC2State/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if EnableC2State has been written or not
EnableC2StateCheck = False
Index: branches/ErmaC/package/Scripts/BaseOptions/EnableC3State/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/BaseOptions/EnableC3State/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/BaseOptions/EnableC3State/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if EnableC3State has been written or not
EnableC3StateCheck = False
Index: branches/ErmaC/package/Scripts/BaseOptions/arch/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/BaseOptions/arch/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/BaseOptions/arch/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if arch has been written or not
archCheck = False
Index: branches/ErmaC/package/Scripts/BaseOptions/EnableC4State/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/BaseOptions/EnableC4State/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/BaseOptions/EnableC4State/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if EnableC4State has been written or not
EnableC4StateCheck = False
Index: branches/ErmaC/package/Scripts/BaseOptions/GeneratePStates/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/BaseOptions/GeneratePStates/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/BaseOptions/GeneratePStates/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if GeneratePStates has been written or not
GeneratePStatesCheck = False
Index: branches/ErmaC/package/Scripts/Resolutions/1024x768x32/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Resolutions/1024x768x32/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Resolutions/1024x768x32/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: branches/ErmaC/package/Scripts/Resolutions/1024x600x32/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Resolutions/1024x600x32/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Resolutions/1024x600x32/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: branches/ErmaC/package/Scripts/Resolutions/1920x1200x32/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Resolutions/1920x1200x32/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Resolutions/1920x1200x32/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: branches/ErmaC/package/Scripts/Resolutions/1600x900x32/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Resolutions/1600x900x32/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Resolutions/1600x900x32/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: branches/ErmaC/package/Scripts/Resolutions/1280x1024x32/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Resolutions/1280x1024x32/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Resolutions/1280x1024x32/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: branches/ErmaC/package/Scripts/Resolutions/1440x900x32/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Resolutions/1440x900x32/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Resolutions/1440x900x32/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: branches/ErmaC/package/Scripts/Resolutions/1280x800x32/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Resolutions/1280x800x32/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Resolutions/1280x800x32/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: branches/ErmaC/package/Scripts/Resolutions/1680x1050x32/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Resolutions/1680x1050x32/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Resolutions/1680x1050x32/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: branches/ErmaC/package/Scripts/Resolutions/1920x1080x32/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Resolutions/1920x1080x32/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Resolutions/1920x1080x32/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: branches/ErmaC/package/Scripts/Resolutions/1280x960x32/postinstall
===================================================================
--- branches/ErmaC/package/Scripts/Resolutions/1280x960x32/postinstall (revision 1497)
+++ branches/ErmaC/package/Scripts/Resolutions/1280x960x32/postinstall (revision 1498)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: branches/ErmaC/package/buildpkg.sh
===================================================================
--- branches/ErmaC/package/buildpkg.sh (revision 1497)
+++ branches/ErmaC/package/buildpkg.sh (revision 1498)
@@ -86,7 +86,8 @@
mkdir -p ${1}/Standard/Root
mkdir -p ${1}/Standard/Scripts/Tools
cp -f ${pkgroot}/Scripts/Standard/* ${1}/Standard/Scripts
- # ditto --arch i386 `which SetFile` ${1}/Standard/Scripts/Tools/SetFile
+ ditto --arch i386 `which SetFile` ${1}/Standard/Scripts/Tools/SetFile
+ ditto --noextattr --noqtn ${1%/*}/i386/fdisk440 ${1}/Standard/Scripts/Tools
echo " [BUILD] Standard "
buildpackage "${1}/Standard" "/" "${coresize}" "start_enabled=\"true\" start_selected=\"upgrade_allowed()\" selected=\"exclusive(choices['EFI']) && exclusive(choices['noboot'])\"" >/dev/null 2>&1
# End build standard package
@@ -95,7 +96,8 @@
mkdir -p ${1}/EFI/Root
mkdir -p ${1}/EFI/Scripts/Tools
cp -f ${pkgroot}/Scripts/EFI/* ${1}/EFI/Scripts
- # ditto --arch i386 `which SetFile` ${1}/EFI/Scripts/Tools/SetFile
+ ditto --arch i386 `which SetFile` ${1}/EFI/Scripts/Tools/SetFile
+ ditto --noextattr --noqtn ${1%/*}/i386/fdisk440 ${1}/Standard/Scripts/Tools
echo " [BUILD] EFI "
buildpackage "${1}/EFI" "/" "${coresize}" "start_visible=\"systemHasGPT()\" start_selected=\"false\" selected=\"exclusive(choices['Standard']) && exclusive(choices['noboot'])\"" >/dev/null 2>&1
# End build efi package