Chameleon

Chameleon Commit Details

Date:2011-08-27 09:33:46 (12 years 7 months ago)
Author:Azimutz
Commit:1464
Parents: 1463
Message:Sync these with trunk (r1463).
Changes:
M/branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c
M/branches/azimutz/trunkGraphicsEnablerModules/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf
M/branches/azimutz/Package
M/branches/azimutz/trunkAutoResolution/package/Resources/de.lproj/Localizable.strings
M/branches/azimutz/trunkGraphicsEnablerModules/package/buildpkg.sh
M/branches/azimutz/Package/i386/boot2/boot.c
M/branches/azimutz/Package/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf
M/branches/azimutz/trunkAutoResolution
M/branches/azimutz/trunkGraphicsEnablerModules/package/Resources/de.lproj/Localizable.strings
M/branches/azimutz/trunkAutoResolution/i386/boot2/boot.c
M/branches/azimutz/trunkAutoResolution/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf
M/branches/azimutz/trunkAutoResolution/package/buildpkg.sh
M/branches/azimutz/trunkGraphicsEnablerModules
M/branches/azimutz/Package/package/Resources/de.lproj/Localizable.strings

File differences

branches/azimutz/trunkAutoResolution/i386/boot2/boot.c
256256
257257
258258
259
259
260260
261261
262
263
264262
265263
266264
267
268
269
270
271
272
273
274
275
265
266
267
276268
277269
278270
......
587579
588580
589581
590
591582
592583
593
584
585
594586
595587
596588
......
715707
716708
717709
710
711
712
713
714
715
716
717
718
719
720
721
718722
719723
720724
......
728732
729733
730734
731
732
735
736
733737
734738
735739
......
747751
748752
749753
750
754
751755
752756
753757
//==========================================================================
// LoadKernelCache - Try to load Kernel Cache.
// return the length of the loaded cache file or -1 on error
long LoadKernelCache(void **binary) {
long LoadKernelCache(const char* cacheFile, void **binary) {
charkernelCacheFile[512];
charkernelCachePath[512];
const char*val;
int len;
longflags, time, cachetime, kerneltime, exttime, ret=-1;
unsigned long adler32;
// Determine the name of the Kernel Cache
if (getValueForKey(kKernelCacheKey, &val, &len, &bootInfo->bootConfig)) {
if (val[0] == '\\')
{
len--;
val++;
}
strlcpy(kernelCacheFile, val, len + 1);
}
// Use specify kernel cache file if not empty
if (cacheFile[0] != 0)
strlcpy(kernelCacheFile, cacheFile, sizeof(kernelCacheFile));
else {
// Lion prelink kernel cache file
if (checkOSVersion("10.7")) {
longflags, sleeptime, time;
void*binary = (void *)kLoadAddr;
// additional variable for testing alternate kernel image locations on boot helper partitions.
char bootFile[sizeof(bootInfo->bootFile)];
charbootFilePath[512];
charkernelCacheFile[512];
// Initialize globals.
sysConfigValid = false;
gErrors = false;
if (useKernelCache) do {
// Determine the name of the Kernel Cache
if (getValueForKey(kKernelCacheKey, &val, &len, &bootInfo->bootConfig)) {
if (val[0] == '\\')
{
len--;
val++;
}
strlcpy(kernelCacheFile, val, len + 1);
} else {
kernelCacheFile[0] = 0; // Use default kernel cache file
}
// If boot from boot helper partitions and OS is Lion use prelink kernel.
// We need to find a solution to load extra mkext with a prelink kernel.
if (gBootVolume->flags & kBVFlagBooter && checkOSVersion("10.7")) {
useKernelCache = false;
break;
}
if (gOverrideKernel) {
verbose("Using a non default kernel (%s), KernelCache will not be used\n",
if (gOverrideKernel && kernelCacheFile[0] == 0) {
verbose("Using a non default kernel (%s) without specifying 'Kernel Cache' path, KernelCache will not be used\n",
bootInfo->bootFile);
useKernelCache = false;
break;
do {
if (useKernelCache) {
ret = LoadKernelCache(&binary);
ret = LoadKernelCache(kernelCacheFile, &binary);
if (ret >= 0)
break;
}
branches/azimutz/trunkAutoResolution/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf
2626
2727
2828
29
29
3030
3131
3232
3333
3434
35
35
36
\b0\fs30 \cf0 \
\pard\ri0\ql\qnatural
\b\fs26 \cf0 Packages credits to : %PKGDEV%
\b\fs26 \cf0 Pkg : %PKGDEV%
\b0\fs30 \
\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
\cf0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
\fs26 \cf0 Copyright \'a9 2011}
\fs26 \cf0 Copyright \'a9 2011
\b \cf3 German translation: !Xabbu}
branches/azimutz/trunkAutoResolution/package/buildpkg.sh
293293
294294
295295
296
296
297297
298298
299299
do
theme=$( echo ${themes[$i]##*/} | awk 'BEGIN{OFS=FS=""}{$1=toupper($1);print}' )
mkdir -p "${1}/${themes[$i]##*/}/Root/"
rsync -r --exclude=.svn "${themes[$i]}" "${1}/${themes[$i]##*/}/Root/${theme}"
rsync -r --exclude=.svn "${themes[$i]}/" "${1}/${themes[$i]##*/}/Root/${theme}"
# #### Comment out thx meklort
# ditto --noextattr --noqtn "${themes[$i]}" "${1}/${themes[$i]##*/}/Root/${theme}"
# ####
branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c
225225
226226
227227
228
228
229229
230230
231
232
233231
234232
235233
236
237
238
239
240
241
242
243
244
234
235
236
245237
246238
247239
......
498490
499491
500492
501
502493
503494
504
495
496
505497
506498
507499
......
623615
624616
625617
618
619
620
621
622
623
624
625
626
627
628
629
626630
627631
628632
......
636640
637641
638642
639
640
643
644
641645
642646
643647
......
655659
656660
657661
658
662
659663
660664
661665
//==========================================================================
// LoadKernelCache - Try to load Kernel Cache.
// return the length of the loaded cache file or -1 on error
long LoadKernelCache(void **binary) {
long LoadKernelCache(const char* cacheFile, void **binary) {
charkernelCacheFile[512];
charkernelCachePath[512];
const char*val;
int len;
longflags, time, cachetime, kerneltime, exttime, ret=-1;
unsigned long adler32;
// Determine the name of the Kernel Cache
if (getValueForKey(kKernelCacheKey, &val, &len, &bootInfo->bootConfig)) {
if (val[0] == '\\')
{
len--;
val++;
}
strlcpy(kernelCacheFile, val, len + 1);
}
// Use specify kernel cache file if not empty
if (cacheFile[0] != 0)
strlcpy(kernelCacheFile, cacheFile, sizeof(kernelCacheFile));
else {
// Lion prelink kernel cache file
if (checkOSVersion("10.7")) {
longflags, sleeptime, time;
void*binary = (void *)kLoadAddr;
// additional variable for testing alternate kernel image locations on boot helper partitions.
char bootFile[sizeof(bootInfo->bootFile)];
charbootFilePath[512];
charkernelCacheFile[512];
// Initialize globals.
sysConfigValid = false;
gErrors = false;
if (useKernelCache) do {
// Determine the name of the Kernel Cache
if (getValueForKey(kKernelCacheKey, &val, &len, &bootInfo->bootConfig)) {
if (val[0] == '\\')
{
len--;
val++;
}
strlcpy(kernelCacheFile, val, len + 1);
} else {
kernelCacheFile[0] = 0; // Use default kernel cache file
}
// If boot from boot helper partitions and OS is Lion use prelink kernel.
// We need to find a solution to load extra mkext with a prelink kernel.
if (gBootVolume->flags & kBVFlagBooter && checkOSVersion("10.7")) {
useKernelCache = false;
break;
}
if (gOverrideKernel) {
verbose("Using a non default kernel (%s), KernelCache will not be used\n",
if (gOverrideKernel && kernelCacheFile[0] == 0) {
verbose("Using a non default kernel (%s) without specifying 'Kernel Cache' path, KernelCache will not be used\n",
bootInfo->bootFile);
useKernelCache = false;
break;
do {
if (useKernelCache) {
ret = LoadKernelCache(&binary);
ret = LoadKernelCache(kernelCacheFile, &binary);
if (ret >= 0)
break;
}
branches/azimutz/trunkGraphicsEnablerModules/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf
2626
2727
2828
29
29
3030
3131
3232
3333
3434
35
35
36
\b0\fs30 \cf0 \
\pard\ri0\ql\qnatural
\b\fs26 \cf0 Packages credits to : %PKGDEV%
\b\fs26 \cf0 Pkg : %PKGDEV%
\b0\fs30 \
\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
\cf0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
\fs26 \cf0 Copyright \'a9 2011}
\fs26 \cf0 Copyright \'a9 2011
\b \cf3 German translation: !Xabbu}
branches/azimutz/trunkGraphicsEnablerModules/package/buildpkg.sh
293293
294294
295295
296
296
297297
298298
299299
do
theme=$( echo ${themes[$i]##*/} | awk 'BEGIN{OFS=FS=""}{$1=toupper($1);print}' )
mkdir -p "${1}/${themes[$i]##*/}/Root/"
rsync -r --exclude=.svn "${themes[$i]}" "${1}/${themes[$i]##*/}/Root/${theme}"
rsync -r --exclude=.svn "${themes[$i]}/" "${1}/${themes[$i]##*/}/Root/${theme}"
# #### Comment out thx meklort
# ditto --noextattr --noqtn "${themes[$i]}" "${1}/${themes[$i]##*/}/Root/${theme}"
# ####
branches/azimutz/Package/i386/boot2/boot.c
225225
226226
227227
228
228
229229
230230
231
232
233231
234232
235233
236
237
238
239
240
241
242
243
244
234
235
236
245237
246238
247239
......
498490
499491
500492
501
502493
503494
504
495
496
505497
506498
507499
......
623615
624616
625617
618
619
620
621
622
623
624
625
626
627
628
629
626630
627631
628632
......
636640
637641
638642
639
640
643
644
641645
642646
643647
......
655659
656660
657661
658
662
659663
660664
661665
//==========================================================================
// LoadKernelCache - Try to load Kernel Cache.
// return the length of the loaded cache file or -1 on error
long LoadKernelCache(void **binary) {
long LoadKernelCache(const char* cacheFile, void **binary) {
charkernelCacheFile[512];
charkernelCachePath[512];
const char*val;
int len;
longflags, time, cachetime, kerneltime, exttime, ret=-1;
unsigned long adler32;
// Determine the name of the Kernel Cache
if (getValueForKey(kKernelCacheKey, &val, &len, &bootInfo->bootConfig)) {
if (val[0] == '\\')
{
len--;
val++;
}
strlcpy(kernelCacheFile, val, len + 1);
}
// Use specify kernel cache file if not empty
if (cacheFile[0] != 0)
strlcpy(kernelCacheFile, cacheFile, sizeof(kernelCacheFile));
else {
// Lion prelink kernel cache file
if (checkOSVersion("10.7")) {
longflags, sleeptime, time;
void*binary = (void *)kLoadAddr;
// additional variable for testing alternate kernel image locations on boot helper partitions.
char bootFile[sizeof(bootInfo->bootFile)];
charbootFilePath[512];
charkernelCacheFile[512];
// Initialize globals.
sysConfigValid = false;
gErrors = false;
if (useKernelCache) do {
// Determine the name of the Kernel Cache
if (getValueForKey(kKernelCacheKey, &val, &len, &bootInfo->bootConfig)) {
if (val[0] == '\\')
{
len--;
val++;
}
strlcpy(kernelCacheFile, val, len + 1);
} else {
kernelCacheFile[0] = 0; // Use default kernel cache file
}
// If boot from boot helper partitions and OS is Lion use prelink kernel.
// We need to find a solution to load extra mkext with a prelink kernel.
if (gBootVolume->flags & kBVFlagBooter && checkOSVersion("10.7")) {
useKernelCache = false;
break;
}
if (gOverrideKernel) {
verbose("Using a non default kernel (%s), KernelCache will not be used\n",
if (gOverrideKernel && kernelCacheFile[0] == 0) {
verbose("Using a non default kernel (%s) without specifying 'Kernel Cache' path, KernelCache will not be used\n",
bootInfo->bootFile);
useKernelCache = false;
break;
do {
if (useKernelCache) {
ret = LoadKernelCache(&binary);
ret = LoadKernelCache(kernelCacheFile, &binary);
if (ret >= 0)
break;
}
branches/azimutz/Package/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf
2626
2727
2828
29
29
3030
3131
3232
3333
3434
35
35
36
\b0\fs30 \cf0 \
\pard\ri0\ql\qnatural
\b\fs26 \cf0 Packages credits to : %PKGDEV%
\b\fs26 \cf0 Pkg : %PKGDEV%
\b0\fs30 \
\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
\cf0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
\fs26 \cf0 Copyright \'a9 2011}
\fs26 \cf0 Copyright \'a9 2011
\b \cf3 German translation: !Xabbu}

Archive Download the corresponding diff file

Revision: 1464