Index: branches/blackosx/package/OptionalSettings/Resolution.txt =================================================================== --- branches/blackosx/package/OptionalSettings/Resolution.txt (revision 0) +++ branches/blackosx/package/OptionalSettings/Resolution.txt (revision 1588) @@ -0,0 +1,29 @@ +# --------------------------------------------- +# Chameleon Optional Settings List. +# Add boot options or kernel flags in to these files. +#ÊUse one file or many files - it's flexible. +# The filename is used as the sub menu heading. +# --------------------------------------------- +# To add boot option: Structure is name:key=value +# example1: InstantMenu:Instant Menu=Yes +# example2: DropSSDT:DropSSDT=Yes +# --------------------------------------------- +# To add kernel flag: Structure is name:KFflag=kernelflag +# example1: Npci:KFflag=npci=0x2000 +# example2: Verbose:KFflag=-v +# --------------------------------------------- +# Note: There must be a carriage return at end of last line +# --------------------------------------------- +Exclusive=True +# --------------------------------------------- +1024x600x32:Graphics Mode=1024x600x32 +1024x768x32:Graphics Mode=1024x768x32 +1280x768x32:Graphics Mode=1280x768x32 +1280x800x32:Graphics Mode=1280x800x32 +1280x960x32:Graphics Mode=1280x960x32 +1280x1024x32:Graphics Mode=1280x1024x32 +1440x900x32:Graphics Mode=1440x900x32 +1600x900x32:Graphics Mode=1600x900x32 +1680x1050x32:Graphics Mode=1680x1050x32 +1920x1080x32:Graphics Mode=1920x1080x32 +1920x1200x32:Graphics Mode=1920x1200x32 Index: branches/blackosx/package/OptionalSettings/Video.txt =================================================================== --- branches/blackosx/package/OptionalSettings/Video.txt (revision 0) +++ branches/blackosx/package/OptionalSettings/Video.txt (revision 1588) @@ -0,0 +1,11 @@ +# --------------------------------------------- +# Chameleon boot options list. +# Structure is name:key=value +# Note: There must be a carriage return at end of last line +# --------------------------------------------- +Exclusive=False +# --------------------------------------------- +GraphicsEnabler:GraphicsEnabler=Yes +UseAtiROM:UseAtiROM=Yes +UseNvidiaROM:UseNvidiaROM=Yes +VBIOS:VBIOS=Yes Index: branches/blackosx/package/OptionalSettings/PowerManagement.txt =================================================================== --- branches/blackosx/package/OptionalSettings/PowerManagement.txt (revision 0) +++ branches/blackosx/package/OptionalSettings/PowerManagement.txt (revision 1588) @@ -0,0 +1,25 @@ +# --------------------------------------------- +# Chameleon Optional Settings List. +# Add boot options or kernel flags in to these files. +#ÊUse one file or many files - it's flexible. +# The filename is used as the sub menu heading. +# --------------------------------------------- +# To add boot option: Structure is name:key=value +# example1: InstantMenu:Instant Menu=Yes +# example2: DropSSDT:DropSSDT=Yes +# --------------------------------------------- +# To add kernel flag: Structure is name:KFflag=kernelflag +# example1: Npci:KFflag=npci=0x2000 +# example2: Verbose:KFflag=-v +# --------------------------------------------- +# Note: There must be a carriage return at end of last line +# --------------------------------------------- +Exclusive=False +# --------------------------------------------- +CSTUsingSystemIO:CSTUsingSystemIO=Yes +DropSSDT:DropSSDT=Yes +EnableC2State:EnableC2State=Yes +EnableC3State:EnableC3State=Yes +EnableC4State:EnableC4State=Yes +GenerateCStates:GenerateCStates=Yes +GeneratePStates:GeneratePStates=Yes Index: branches/blackosx/package/OptionalSettings/General.txt =================================================================== --- branches/blackosx/package/OptionalSettings/General.txt (revision 0) +++ branches/blackosx/package/OptionalSettings/General.txt (revision 1588) @@ -0,0 +1,28 @@ +# --------------------------------------------- +# Chameleon Optional Settings List. +# Add boot options or kernel flags in to these files. +#ÊUse one file or many files - it's flexible. +# The filename is used as the sub menu heading. +# --------------------------------------------- +# To add boot option: Structure is name:key=value +# example1: InstantMenu:Instant Menu=Yes +# example2: DropSSDT:DropSSDT=Yes +# --------------------------------------------- +# To add kernel flag: Structure is name:KFflag=kernelflag +# example1: Npci:KFflag=npci=0x2000 +# example2: Verbose:KFflag=-v +# --------------------------------------------- +# Note: There must be a carriage return at end of last line +# --------------------------------------------- +Exclusive=False +# --------------------------------------------- +arch:arch=i386 +EHCIacquire:EHCIacquire=Yes +EthernetBuiltIn:EthernetBuiltIn=Yes +ForceHPET:ForceHPET=Yes +ForceWake:ForceWake=Yes +RestartFix:RestartFix=No +UHCIreset:UHCIreset=Yes +UseMemDetect:UseMemDetect=No +UseKernelCache:UseKernelCache=Yes +Wake:Wake=Yes Index: branches/blackosx/package/OptionalSettings/KernelFlags.txt =================================================================== --- branches/blackosx/package/OptionalSettings/KernelFlags.txt (revision 0) +++ branches/blackosx/package/OptionalSettings/KernelFlags.txt (revision 1588) @@ -0,0 +1,22 @@ +# --------------------------------------------- +# Chameleon Optional Settings List. +# Add boot options or kernel flags in to these files. +#ÊUse one file or many files - it's flexible. +# The filename is used as the sub menu heading. +# --------------------------------------------- +# To add boot option: Structure is name:key=value +# example1: InstantMenu:Instant Menu=Yes +# example2: DropSSDT:DropSSDT=Yes +# --------------------------------------------- +# To add kernel flag: Structure is name:KFflag=kernelflag +# example1: Npci:KFflag=npci=0x2000 +# example2: Verbose:KFflag=-v +# --------------------------------------------- +# Note: There must be a carriage return at end of last line +# --------------------------------------------- +Exclusive=False +# --------------------------------------------- +Verbose:KFflag=-v +Singleusermode:KFflag=-s +Ignorecaches:KFflag=-f +Npci:KFflag=npci=0x2000 Index: branches/blackosx/package/OptionalSettings/Control.txt =================================================================== --- branches/blackosx/package/OptionalSettings/Control.txt (revision 0) +++ branches/blackosx/package/OptionalSettings/Control.txt (revision 1588) @@ -0,0 +1,25 @@ +# --------------------------------------------- +# Chameleon Optional Settings List. +# Add boot options or kernel flags in to these files. +#ÊUse one file or many files - it's flexible. +# The filename is used as the sub menu heading. +# --------------------------------------------- +# To add boot option: Structure is name:key=value +# example1: InstantMenu:Instant Menu=Yes +# example2: DropSSDT:DropSSDT=Yes +# --------------------------------------------- +# To add kernel flag: Structure is name:KFflag=kernelflag +# example1: Npci:KFflag=npci=0x2000 +# example2: Verbose:KFflag=-v +# --------------------------------------------- +# Note: There must be a carriage return at end of last line +# --------------------------------------------- +Exclusive=False +# --------------------------------------------- +BootBanner:Boot Banner=No +GUI:GUI=No +LegacyLogo:Legacy Logo=Yes +InstantMenu:Instant Menu=Yes +QuietBoot:QuietBoot=Yes +ShowInfo:ShowInfo=No +Wait:Wait=Yes Index: branches/blackosx/package/buildpkg.sh =================================================================== --- branches/blackosx/package/buildpkg.sh (revision 1587) +++ branches/blackosx/package/buildpkg.sh (revision 1588) @@ -189,16 +189,16 @@ ((xmlindent++)) # ------------------------------------------------------ - # parse BootOptions folder to find files of boot options. + # parse OptionalSettings folder to find files of boot options. # ------------------------------------------------------ - bootOptionsFolder="${pkgroot}/BootOptions" - bootOptionFiles=($( find "${bootOptionsFolder}" -depth 1 -not -name '.svn' )) + OptionalSettingsFolder="${pkgroot}/OptionalSettings" + OptionalSettingsFiles=($( find "${OptionalSettingsFolder}" -depth 1 -not -name '.svn' )) - for (( i = 0 ; i < ${#bootOptionFiles[@]} ; i++ )) + for (( i = 0 ; i < ${#OptionalSettingsFiles[@]} ; i++ )) do # Take filename and Strip .txt from end and path from front - builtOptionsList=$( echo ${bootOptionFiles[$i]%.txt} ) + builtOptionsList=$( echo ${OptionalSettingsFiles[$i]%.txt} ) builtOptionsList=$( echo ${builtOptionsList##*/} ) echo "================= $builtOptionsList =================" outline[$((outlinecount++))]="${indent[$xmlindent]}\t" @@ -226,8 +226,8 @@ ((count++)) fi fi - done < ${bootOptionFiles[$i]} - buildbootoptions "$1" "${exclusiveFlag}" "${exclusiveName}" + done < ${OptionalSettingsFiles[$i]} + buildoptionalsettings "$1" "${exclusiveFlag}" "${exclusiveName}" ((xmlindent--)) outline[$((outlinecount++))]="${indent[$xmlindent]}\t" @@ -254,7 +254,7 @@ done # call buildbootoptions with 1 to indicate exclusive option wanted. - buildbootoptions "$1" "1" "keylayout" + buildoptionalsettings "$1" "1" "keylayout" ((xmlindent--)) outline[$((outlinecount++))]="${indent[$xmlindent]}\t" @@ -320,7 +320,7 @@ chown -R 0:0 "${1}" } -buildbootoptions() +buildoptionalsettings() { # $1 Path to package to build containing Root and or Scripts # $2 = exclusiveFlag