Sync with svn trunk revision 2128

Make.rules

@@ -83,7 +83,7 @@ $(HEADER_VERSION): $(SRCROOT)/version
 	@echo "#define I386BOOT_VERSION \"5.0.132\"" > $@
 	@echo "#define I386BOOT_BUILDDATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $@
 	@echo "#define I386BOOT_CHAMELEONVERSION \"`cat $(SRCROOT)/version`\"" >> $@
-	@echo "#define I386BOOT_CHAMELEONREVISION \"`svnversion -n | tr -d [:alpha:]`\"" >> $@
+	@echo "#define I386BOOT_MYHACKVERSION \"`cat $(SRCROOT)/myhackversion`\"" >> $@
 
 CONFIG_HEADERS=$(CONFIG_FILES) $(HEADER_VERSION)
 

Makefile

@@ -6,16 +6,15 @@ DSTROOT = $(SRCROOT)/dst
 DOCROOT = $(SRCROOT)/doc
 IMGSKELROOT = $(SRCROOT)/imgskel
 CDBOOT = ${IMGROOT}/usr/standalone/i386/cdboot
-PKG_BUILD_DIR = $(SYMROOT)/package
 
 include Make.rules
 
 
 THEME = default
 
 VERSION = `cat ${SRCROOT}/version`
-REVISION = `cat ${SRCROOT}/revision`
-PRODUCT = Chameleon-$(VERSION)-r$(REVISION)
+MYHACKVERSION = `cat ${SRCROOT}/myhackversion`
+PRODUCT = Chameleon-$(VERSION)
 CDLABEL = ${PRODUCT}
 ISOIMAGE = ${SYMROOT}/${CDLABEL}.iso
 DISTFILE = ${SYMROOT}/${PRODUCT}
@@ -34,16 +33,13 @@ GENERIC_SUBDIRS =
 SUBDIRS = $(GENERIC_SUBDIRS) i386
 DIST_SUBDIRS = $(SUBDIRS)
 
-$(SRCROOT)/revision:
-	@svnversion -n | tr -d [:alpha:] > $(SRCROOT)/revision
-
 #
 # Currently builds for i386
 #
 config rebuild_config:
 	@make -C $(SRCROOT)/i386/config $@
 
-all: $(SYMROOT) $(OBJROOT) $(CONFIG_HEADERS) $(HEADER_VERSION) $(SRCROOT)/revision
+all: $(SYMROOT) $(OBJROOT) $(CONFIG_HEADERS) $(HEADER_VERSION) $(SRCROOT)/myhackversion
 	@$(MAKE) all-recursive
 
 dist image: all
@@ -102,8 +98,7 @@ endif
 clean-local:
 	@if [ -d "$(PKG_BUILD_DIR)" ];then echo "\t[RMDIR] $(PKG_BUILD_DIR)"; fi
 	@if [ -f "$(HEADER_VERSION)" ];then echo "\t[RM] $(HEADER_VERSION)"; fi
-	@if [ -f "$(SRCROOT)/revision" ];then echo "\t[RM] $(SRCROOT)/revision"; fi
-	@rm -rf "$(PKG_BUILD_DIR)" $(HEADER_VERSION) $(SRCROOT)/revision
+	@rm -rf "$(HEADER_VERSION)"
 
 AUTOCONF_FILES = $(SRCROOT)/auto.conf    $(SRCROOT)/autoconf.h \
 				 $(SRCROOT)/autoconf.inc $(SRCROOT)/.config $(SRCROOT)/.config.old
@@ -120,18 +115,13 @@ distclean-local:
             $(SRCROOT)/i386/modules/module_includes \
             $(AUTOCONF_FILES)
 
-pkg installer: all
-	@echo "================= Building Package ================="
-	@${SRCROOT}/package/buildpkg.sh "$(SRCROOT)" "$(SYMROOT)" "$(PKG_BUILD_DIR)"
-
 help:
 	@echo   'Configuration target:'
 	@echo   '  config    - Show configuration menu'
 	@echo
 	@echo   'Build targets:'
 	@echo   '  all       - Build all targets [DEFAULT]'
 	@echo   '  dist      - Build distribution tarball'
-	@echo   '  pkg       - Build installer package'
 	@echo
 	@echo   'Cleaning targets:'
 	@echo   '  clean     - Remove most generated files'
@@ -143,6 +133,5 @@ help:
 .PHONY: config
 .PHONY: clean
 .PHONY: image
-.PHONY: pkg
 .PHONY: installer
 .PHONY: help

i386/boot2/prompt.c

@@ -28,19 +28,21 @@
 
 #include <vers.h>
 
-char bootBanner[] = "\nDarwin/x86 boot v" I386BOOT_VERSION " - Chameleon v" I386BOOT_CHAMELEONVERSION " r" I386BOOT_CHAMELEONREVISION "\n"
+char bootBanner[] = "\nDarwin/x86 boot v" I386BOOT_VERSION " | Chameleon " I386BOOT_CHAMELEONVERSION " | myHack " I386BOOT_MYHACKVERSION "\n"
                     "Build date: " I386BOOT_BUILDDATE "\n"
                     "%dMB memory\n";
 
 char bootPrompt[] =
     "Press Enter to start up Darwin/x86 with no options, or you can:\n"
+    "  Type -f and press Enter to start up skipping system caches\n"
     "  Type -v and press Enter to start up with diagnostic messages\n"
     "  Type ? and press Enter to learn about advanced startup options\n\n"
     "boot: ";
 
 char bootRescanPrompt[] =
     "Press Enter to start up Darwin/x86 with no options, or you can:\n"
     "  Press F5 after you swapped the media. The drive will be rescanned.\n"
+    "  Type -f and press Enter to start up skipping system caches\n"
     "  Type -v and press Enter to start up with diagnostic messages\n"
     "  Type ? and press Enter to learn about advanced startup options\n\n"
     "boot: ";

i386/libsaio/console.c

@@ -91,7 +91,7 @@ void initBooterLog(void)
 	msgbuf = malloc(BOOTER_LOG_SIZE);
 	bzero(msgbuf, BOOTER_LOG_SIZE);
 	cursor = msgbuf;
-	msglog("%s\n", "Chameleon " I386BOOT_CHAMELEONVERSION " (svn-r" I386BOOT_CHAMELEONREVISION ")" " [" I386BOOT_BUILDDATE "]");
+	msglog("%s\n", "Chameleon " I386BOOT_CHAMELEONVERSION " - myHack " I386BOOT_MYHACKVERSION " [" I386BOOT_BUILDDATE "]");
 }
 
 void msglog(const char * fmt, ...)

myhackversion

@@ -0,0 +1 @@
+3.2