Chameleon

Chameleon Commit Details

Date:2011-07-19 09:36:53 (8 years 2 hours ago)
Author:Sergey Slice
Commit:1175
Parents: 1174
Message:do not make all when make image b/c we have to do make image twice
Changes:
M/branches/slice/trunkM/Makefile
M/branches/slice/trunkM/i386/libsaio/acpi_patcher.c
M/branches/slice/trunkM/i386/modules/Makefile
M/branches/slice/trunkM/revision
M/branches/slice/trunkM/i386/modules/Networking/Networking.c
M/branches/slice/trunkM/i386/Cconfig
M/branches/slice/trunkM/artwork/themes/default/logo.png
M/branches/slice/trunkM/i386/modules/NVRAM/NVRAM.c
M/branches/slice/trunkM/i386/modules/Cconfig

File differences

branches/slice/trunkM/i386/libsaio/acpi_patcher.c
159159
160160
161161
162
162
163163
164164
165165
{
if (read (fd, tableAddr, file_size (fd))!=file_size (fd))
{
verbose("Couldn't read table %s\n",dirspec);
//verbose("Couldn't read table %s\n",dirspec);
free (tableAddr);
close (fd);
return NULL;
branches/slice/trunkM/i386/Cconfig
44
55
66
7
7
88
99
1010
config OPTIMIZATION_LEVEL
string "Optimization Level"
default "-Oz"
default "-Os"
---help---
Specify the level to compile chameleon with.
branches/slice/trunkM/i386/modules/NVRAM/NVRAM.c
1010
1111
1212
13
13
1414
1515
1616
......
4343
4444
4545
46
46
4747
4848
4949
......
8080
8181
8282
83
83
8484
8585
8686
......
9696
9797
9898
99
99
100100
101101
102102
......
118118
119119
120120
121
122
121
122
123123
124124
125125
......
157157
158158
159159
160
160
161161
162162
163163
#include "bootstruct.h"
#include "pci.h"
#include "efi.h"
#include "smbios_patcher.h"
#include "smbios_getters.h"
#include "xml.h"
#ifndef DEBUG_NVRAM
#define kBL_APPLE_VENDOR_NVRAM_GUID "4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14"
#define UUID_LEN16
extern EFI_GUID* getSystemID();
//extern EFI_GUID* getSystemID();
void NVRAM_hook(void* arg1, void* arg2, void* arg3, void* arg4);
void NVRAM_start(void);
char*ffmName;
char*boName;
char*bnName;
EFI_GUID*ret = 0;
//EFI_GUID*ret = 0;
uint16_tbootOptionNumber = 0;
int i, j;
//TagPtrdictionary;
int cnt;
var = malloc(sizeof(variables)+1);
ClearNVRAM = getValueForKey(kClearNVRAM, &buff, &cnt, &bootInfo->bootConfig);
ClearNVRAM = getValueForKey("-c", &buff, &cnt, &bootInfo->bootConfig);
if (!ClearNVRAM) {
readNVRAM(var);
}
Node* optionsNode = DT__FindNode("/options", true); //"/fakenvram"
ffName = malloc(sizeof(PLATFORM_UUID)+1);
strcpy(ffName, PLATFORM_UUID);
ret = getSystemID();
DT__AddProperty(optionsNode, ffName, UUID_LEN, (EFI_UINT32*) ret);
//ret = getSystemID();
//DT__AddProperty(optionsNode, ffName, UUID_LEN, (EFI_UINT32*) ret);
// this information can be obtained from DMI Type 0
SMBByte* p = (SMBByte*)FindFirstDmiTableOfType(0, 0x18);
//can we add here boot-properties?
//optionsNode = DT__FindNode("chosen", true);
#if 1 //NOTYET
#if NOTYET
int lbC = 0;
while(((char*)&bootInfo->bootConfig)[lbC++]);
if (lbC > sizeof(bootInfo->bootConfig)) lbC = sizeof(bootInfo->bootConfig);
branches/slice/trunkM/i386/modules/Networking/Networking.c
7777
7878
7979
80
80
8181
8282
8383
return 0;
}
devices_number++;
//devices_number++;
return 1;
}
else
branches/slice/trunkM/i386/modules/Cconfig
66
77
88
9
9
10
11
12
13
14
15
16
1017
source "i386/modules/Resolution/Cconfig"
source "i386/modules/klibc/Cconfig"
source "i386/modules/uClibcxx/Cconfig"
source "i386/modules/HelloWorld/Cconfig"
source "i386/modules/NVRAM/Cconfig"
source "i386/modules/KernelPatcher/Cconfig"
source "i386/modules/KextPatcher/Cconfig"
source "i386/modules/NetbookInstaller/Cconfig"
source "i386/modules/HPET/Cconfig"
source "i386/modules/Memory/Cconfig"
source "i386/modules/Networking/Cconfig"
source "i386/modules/USBFix/Cconfig"
endmenu
branches/slice/trunkM/i386/modules/Makefile
1111
1212
1313
14
15
14
15
1616
1717
1818
include ${SRCROOT}/Make.rules
# The order of building is important.
SUBDIRS = klibc uClibcxx Resolution USBFix
#HelloWorld
SUBDIRS = klibc uClibcxx Resolution NVRAM HPET USBFix
#HelloWorld Memory NetbookInstaller KernelPatcher KextPatcher Networking
CFLAGS= -Os $(MORECPP) -arch i386 -g -static
branches/slice/trunkM/revision
1
1
749
1171
branches/slice/trunkM/Makefile
8989
9090
9191
92
92
9393
9494
9595
9696
97
9798
9899
99100
100101
101102
103
102104
103105
104106
fi; \
done
image: all
image:
@if [ -e "$(SYMROOT)" ]; then \
rm -r -f ${IMGROOT}; \
mkdir -p ${IMGROOT}/usr/standalone/i386; \
mkdir -p ${IMGROOT}/Extra/modules;\
mkdir -p ${IMGROOT}/Extra/Themes/Default;\
if [ -e "$(IMGSKELROOT)" ]; then \
cp -R -f "${IMGSKELROOT}"/* "${IMGROOT}"; \
fi; \
cp -f ${SYMROOT}/i386/cdboot ${CDBOOT}; \
cp -f ${SYMROOT}/i386/modules/* ${IMGROOT}/Extra/modules;\
cp -f ${SRCROOT}/artwork/themes/default/* ${IMGROOT}/Extra/Themes/Default;\
cp -f ${SYMROOT}/i386/boot ${IMGROOT}/usr/standalone/i386; \
cp -f ${SYMROOT}/i386/boot0 ${IMGROOT}/usr/standalone/i386; \
cp -f ${SYMROOT}/i386/boot1h ${IMGROOT}/usr/standalone/i386; \

Archive Download the corresponding diff file

Revision: 1175