Index: branches/meklort/i386/libsaio/xml.c =================================================================== --- branches/meklort/i386/libsaio/xml.c (revision 656) +++ branches/meklort/i386/libsaio/xml.c (revision 657) @@ -643,12 +643,11 @@ { long length; char * string; - TagPtr tmpTag; length = FixDataMatchingTag(buffer, kXMLTagString); if (length == -1) return -1; - tmpTag = NewTag(); + TagPtr tmpTag = NewTag(); if (tmpTag == 0) return -1; string = NewSymbol(buffer); @@ -685,6 +684,7 @@ { printf("Warning integer is non existant\n"); getc(); + tmpTag = NewTag(); tmpTag->type = kTagTypeInteger; tmpTag->string = 0; tmpTag->tag = 0; Index: branches/meklort/i386/libsaio/Makefile =================================================================== --- branches/meklort/i386/libsaio/Makefile (revision 656) +++ branches/meklort/i386/libsaio/Makefile (revision 657) @@ -75,9 +75,12 @@ # ranlib $(SYMROOT)/$@ libsaio.a: $(SAIO_EXTERN_OBJS) $(SAIO_OBJS) - rm -f $(SYMROOT)/$(@F) - ar q $(SYMROOT)/$(@F) $^ - ranlib $(SYMROOT)/$(@F) + @echo "\t[RM] $(SYMROOT)/$(@F)" + @rm -f $(SYMROOT)/$(@F) + @echo "\t[AR] $@" + @ar q $(SYMROOT)/$(@F) $^ &> /dev/null + @echo "\t[RANLIB] $@" + @ranlib $(SYMROOT)/$(@F) #saio_internal.h: saio_external.h #saio_table.c: saio_external.h Index: branches/meklort/i386/libsaio/smbios_patcher.c =================================================================== --- branches/meklort/i386/libsaio/smbios_patcher.c (revision 656) +++ branches/meklort/i386/libsaio/smbios_patcher.c (revision 657) @@ -1133,5 +1133,6 @@ DT__AddProperty(node, "orig-model", tmpLen, gSMBIOSBoardModel); } verbose("Actual model name is '%s'\n", tempString); + return gSMBIOSBoardModel; } Index: branches/meklort/i386/libsaio/smbios_patcher.h =================================================================== --- branches/meklort/i386/libsaio/smbios_patcher.h (revision 656) +++ branches/meklort/i386/libsaio/smbios_patcher.h (revision 657) @@ -56,5 +56,6 @@ extern struct DMIHeader* FindNextDmiTableOfType(int type, int minlen); extern struct DMIHeader* FindFirstDmiTableOfType(int type, int minlen); const char * smbiosStringAtIndex(DMIHeader*, int index, int *length ); +char* getSmbiosProductName(); #endif /* !__LIBSAIO_SMBIOS_PATCHER_H */ Index: branches/meklort/i386/boot0/Makefile =================================================================== --- branches/meklort/i386/boot0/Makefile (revision 656) +++ branches/meklort/i386/boot0/Makefile (revision 657) @@ -9,13 +9,16 @@ all embedtheme optionrom: $(DIRS_NEEDED) boot0 boot0hfs chain0 boot0: boot0.s Makefile $(NASM) - $(NASM) boot0.s -o $(SYMROOT)/$@ + @echo "\t[NASM] $@" + @$(NASM) boot0.s -o $(SYMROOT)/$@ boot0hfs: boot0.s Makefile $(NASM) - $(NASM) boot0.s -DHFSFIRST -o $(SYMROOT)/$@ + @echo "\t[NASM] $@" + @$(NASM) boot0.s -DHFSFIRST -o $(SYMROOT)/$@ chain0: chain0.s Makefile $(NASM) - $(NASM) chain0.s -o $(SYMROOT)/$@ + @echo "\t[NASM] $@" + @$(NASM) chain0.s -o $(SYMROOT)/$@ install_i386:: all $(INSTALLDIR) cp $(SYMROOT)/boot0 $(SYMROOT)/chain0 $(INSTALLDIR) Index: branches/meklort/i386/MakeInc.dir =================================================================== --- branches/meklort/i386/MakeInc.dir (revision 656) +++ branches/meklort/i386/MakeInc.dir (revision 657) @@ -43,32 +43,39 @@ .SUFFIXES: .s .i .c .o .c.o .m.o: - $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o \ + @echo "\t[CC] $<" + @$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o \ -MD -dependency-file $(OBJROOT)/$*.d - md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d + @md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d $(OBJROOT)/%.o: %.c - $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o \ + @echo "\t[CC] $<" + @$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o \ -MD -dependency-file $(OBJROOT)/$*.d - md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d + @md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d $(OBJROOT)/%.o: %.m - $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o \ + @echo "\t[CC] $<" + @$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o \ -MD -dependency-file $(OBJROOT)/$*.d - md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d + @md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d #.s.o: # cc $(INC) -E $< > $(OBJROOT)/$*.o2 # $(AS) -o $(OBJROOT)/$@ $(OBJROOT)/$*.o2 .s.o: - cc $(CPPFLAGS) -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) $< + @echo "\t[AS] $<" + @cc $(CPPFLAGS) -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) $< boot2.o: - cc $(CPPFLAGS) -Wa,-n -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) boot2.s + @echo "\t[AS] boot2.s" + @cc $(CPPFLAGS) -Wa,-n -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) boot2.s $(OBJROOT)/%.o: %.s - cc $(CPPFLAGS) -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) $< + @echo "\t[CC] $<" + @cc $(CPPFLAGS) -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) $< $(DIRS_NEEDED) $(INSTALLDIR) $(SRCROOT): - $(MKDIRS) $@ + @echo "\t[MKDIR] $@" + @$(MKDIRS) $@ Index: branches/meklort/i386/boot1/Makefile =================================================================== --- branches/meklort/i386/boot1/Makefile (revision 656) +++ branches/meklort/i386/boot1/Makefile (revision 657) @@ -20,10 +20,14 @@ all embedtheme optionrom: $(DIRS_NEEDED) $(VERSIONED_FILES) boot1h: boot1.s Makefile - $(NASM) boot1.s -o $(SYMROOT)/boot1h - $(NASM) boot1hp.s -o $(SYMROOT)/boot1hp - $(NASM) boot1he.s -o $(SYMROOT)/boot1he - $(NASM) boot1f32.s -o $(SYMROOT)/boot1f32 + @echo "\t[NASM] boot1.s" + @$(NASM) boot1.s -o $(SYMROOT)/boot1h + @echo "\t[NASM] boot1hp.s" + @$(NASM) boot1hp.s -o $(SYMROOT)/boot1hp + @echo "\t[NASM] boot1he.s" + @$(NASM) boot1he.s -o $(SYMROOT)/boot1he + @echo "\t[NASM] boot1f32.s" + @$(NASM) boot1f32.s -o $(SYMROOT)/boot1f32 install_i386:: all $(INSTALLDIR) cp $(SYMROOT)/boot1h $(INSTALLDIR)/ Index: branches/meklort/i386/boot2/Makefile =================================================================== --- branches/meklort/i386/boot2/Makefile (revision 656) +++ branches/meklort/i386/boot2/Makefile (revision 657) @@ -71,22 +71,24 @@ all embedtheme optionrom: $(DIRS_NEEDED) boot boot: embedded.h machOconv $(OBJS) $(LIBDEP) - $(LD) -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \ + @echo "\t[LD] boot.sys" + @$(LD) -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \ -nostdlib -arch i386 -Wl,-segalign,20 \ -o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS) -lcc_kext @make Symbols.dylib - $(LD) -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \ + @echo "\t[LD] boot_embeded.sys" + @$(LD) -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \ -nostdlib -arch i386 -Wl,-segalign,20 \ -Wl,-sectcreate,__DATA,__Symbols,$(SYMROOT)/Symbols.dylib \ -o $(SYMROOT)/boot_embeded.sys $(filter %.o,$^) $(LIBS) -lcc_kext @make embed_symbols # this is done in a sub process after boot.sys exists so the strings are populated correctly - ##${RM} $(SYMROOT)/${SYMBOLS_MODULE} + @##${RM} $(SYMROOT)/${SYMBOLS_MODULE} - size $(SYMROOT)/boot.sys - ls -l $(SYMROOT)/boot + @##size $(SYMROOT)/boot.sys + @ls -l $(SYMROOT)/boot @( size=`ls -l $(SYMROOT)/boot | awk '{ print $$5}'` ; \ if expr "$$size" ">" "$(MAXBOOTSIZE)" > /dev/null ;\ then \ @@ -97,14 +99,15 @@ embed_symbols: machOconv @echo ================= Embedding Symbols.dylib ================= - machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot + @echo "\t[MACHOCONV] boot" + @$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot &> /dev/null - echo ******* Patching at $(PATCH_ADDR) ****** - stat -f%z $(SYMROOT)/boot | perl -ane "print pack('V',@F[0]);" | dd conv=notrunc of=${SYMROOT}/boot_embeded.sys bs=1 count=4 seek=$(PATCH_ADDR) + @echo ******* Patching at $(PATCH_ADDR) ****** + @stat -f%z $(SYMROOT)/boot | perl -ane "print pack('V',@F[0]);" | dd conv=notrunc of=${SYMROOT}/boot_embeded.sys bs=1 count=4 seek=$(PATCH_ADDR) &> /dev/null + @echo "\t[MACHOCONV] boot_embeded" + @$(SYMROOT)/machOconv $(SYMROOT)/boot_embeded.sys $(SYMROOT)/boot_embeded - machOconv $(SYMROOT)/boot_embeded.sys $(SYMROOT)/boot_embeded - prompt.o: vers.h vers.h: @echo "#define I386BOOT_VERSION \"5.0.132\"" > $(SYMROOT)/vers.h @@ -117,6 +120,10 @@ Symbols.dylib: Symbols.o @echo ================= Compiling ${SYMBOLS_MODULE} ================= + @echo "start" >> ${OBJROOT}/Symbols.save + @echo "_lookup_symbol" >> ${OBJROOT}/Symbols.save + + @echo "\t[LD] $@" @ld -arch i386 \ -undefined dynamic_lookup \ -alias _Symbols_start start \ @@ -127,13 +134,11 @@ -current_version 1.0.0 \ -compatibility_version 1.0.0 \ -final_output Symbols \ + -exported_symbols_list ${OBJROOT}/Symbols.save \ ${OBJROOT}/Symbols.o \ -o $(SYMROOT)/${SYMBOLS_MODULE} - echo "start" >> ${OBJROOT}/Symbols.save - echo "_lookup_symbol" >> ${OBJROOT}/Symbols.save - strip -s ${OBJROOT}/Symbols.save $(SYMROOT)/${SYMBOLS_MODULE} - @size $(SYMROOT)/${SYMBOLS_MODULE} + @##size $(SYMROOT)/${SYMBOLS_MODULE} Symbols.o: @rm -rf $(SYMROOT)/Symbols.h @@ -148,10 +153,10 @@ @echo "symbol_t symbolList[] = {" >> $(SYMROOT)/Symbols.h @nm -g $(SYMROOT)/boot.sys | tr . _ | awk '{print " {.symbol = "$$3"_string, .addr = 0x"$$1"},";}' >> $(SYMROOT)/Symbols.h @echo "};" >> $(SYMROOT)/Symbols.h + @echo "\t[CC] $@" + @$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c Symbols.c $(INC) -o $(OBJROOT)/Symbols.o - $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c Symbols.c $(INC) -o $(OBJROOT)/Symbols.o - install_i386:: all $(INSTALLDIR) cp $(SYMROOT)/boot $(OTHER_FILES) $(INSTALLDIR) cd $(INSTALLDIR); chmod u+w boot $(OTHER_FILES) Index: branches/meklort/i386/modules/MakeInc.dir =================================================================== --- branches/meklort/i386/modules/MakeInc.dir (revision 656) +++ branches/meklort/i386/modules/MakeInc.dir (revision 657) @@ -1,4 +1,5 @@ include ../../MakePaths.dir +include ../../MakeInc.dir OBJROOT=../../../obj/i386/modules/$(DIR) SYMROOT=../../../sym/i386/modules/ @@ -53,7 +54,6 @@ -include ../../MakeInc.dir # dependencies --include $(OBJROOT)/Makedep +#-include $(OBJROOT)/Makedep Index: branches/meklort/i386/modules/klibc/limits.h =================================================================== --- branches/meklort/i386/modules/klibc/limits.h (revision 656) +++ branches/meklort/i386/modules/klibc/limits.h (revision 657) @@ -1,6 +1,6 @@ #define CHAR_BIT 8 -#define UCHAR_MAX 255 +#define UCHAR_MAX 255u #define INT_MAX 2147483647 -#define UINT_MAX 4294967295 \ No newline at end of file +#define UINT_MAX 4294967295u \ No newline at end of file Index: branches/meklort/i386/modules/uClibc++/include/limits =================================================================== --- branches/meklort/i386/modules/uClibc++/include/limits (revision 656) +++ branches/meklort/i386/modules/uClibc++/include/limits (revision 657) @@ -21,7 +21,7 @@ #ifndef __STD_HEADER_LIMITS #define __STD_HEADER_LIMITS 1 -#warning limits header is nowhere complete or accurate +//#warning limits header is nowhere complete or accurate #pragma GCC visibility push(default) Index: branches/meklort/i386/cdboot/Makefile =================================================================== --- branches/meklort/i386/cdboot/Makefile (revision 656) +++ branches/meklort/i386/cdboot/Makefile (revision 657) @@ -9,13 +9,14 @@ all embedtheme optionrom: $(DIRS_NEEDED) cdboot cdboot: cdboot.s $(SYMROOT)/boot Makefile $(NASM) - $(NASM) cdboot.s -o $(SYMROOT)/cdboot - dd if=$(SYMROOT)/boot of=$(SYMROOT)/cdboot conv=sync bs=2k seek=1 + @echo "\t[NASM] cdboot.s" + @$(NASM) cdboot.s -o $(SYMROOT)/cdboot + @dd if=$(SYMROOT)/boot of=$(SYMROOT)/cdboot conv=sync bs=2k seek=1 &> /dev/null - # Update cdboot with boot file size info - stat -f%z $(SYMROOT)/boot \ + @# Update cdboot with boot file size info + @stat -f%z $(SYMROOT)/boot \ | perl -ane "print pack('V',@F[0]);" \ - | dd of=$(SYMROOT)/cdboot bs=1 count=4 seek=2044 conv=notrunc + | dd of=$(SYMROOT)/cdboot bs=1 count=4 seek=2044 conv=notrunc &> /dev/null install_i386:: all $(INSTALLDIR) cp $(SYMROOT)/cdboot $(INSTALLDIR) Index: branches/meklort/i386/libsa/Makefile =================================================================== --- branches/meklort/i386/libsa/Makefile (revision 656) +++ branches/meklort/i386/libsa/Makefile (revision 657) @@ -47,9 +47,12 @@ all embedtheme optionrom: $(DIRS_NEEDED) $(LIBS) libsa.a: $(SA_OBJS) - rm -f $(SYMROOT)/$(@F) - ar q $(SYMROOT)/$(@F) $^ - ranlib $(SYMROOT)/$(@F) + @echo "\t[RM] $(SYMROOT)/$(@F)" + @rm -f $(SYMROOT)/$(@F) + @echo "\t[AR] $@" + @ar q $(SYMROOT)/$(@F) $^ &> /dev/null + @echo "\t[RANLIB] $@" + @ranlib $(SYMROOT)/$(@F) $(INSTALL_SA_DIR) $(INSTALL_MD_DIR): $(MKDIRS) $@ Index: branches/meklort/i386/util/Makefile =================================================================== --- branches/meklort/i386/util/Makefile (revision 656) +++ branches/meklort/i386/util/Makefile (revision 657) @@ -27,10 +27,12 @@ all embedtheme optionrom: $(DIRS_NEEDED) $(PROGRAMS) machOconv: machOconv.o - $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) machOconv.o + @echo "\t[LD] $@" + @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) machOconv.o bdmesg: bdmesg.o - $(CC) $(CFLAGS) $(LDFLAGS) -framework IOKit -framework CoreFoundation -mmacosx-version-min=10.5 -o $(SYMROOT)/$(@F) bdmesg.o + @echo "\t[LD] $@" + @$(CC) $(CFLAGS) $(LDFLAGS) -framework IOKit -framework CoreFoundation -mmacosx-version-min=10.5 -o $(SYMROOT)/$(@F) bdmesg.o include ../MakeInc.dir