From 71ae6f9b152427697880ae018ec906472630255a Mon Sep 17 00:00:00 2001
From: Mike Duigou <mduigou@openjdk.org>
Date: Mon, 17 Jun 2013 09:41:20 -0700
Subject: [PATCH 1/4] 8016572: Pass CONCURRENCY=$(JOBS) to test/Makefile

Reviewed-by: alanb, erikj
---
 common/makefiles/Main.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk
index 0120c1f33f3..100584843fa 100644
--- a/common/makefiles/Main.gmk
+++ b/common/makefiles/Main.gmk
@@ -183,7 +183,7 @@ bootcycle-images-only: start-make
 test: images test-only
 test-only: start-make
 	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k JT_HOME=$(JT_HOME) MAKEFLAGS= PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
+	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
 	@$(call TargetExit)
 
 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be

From e1dd752d544251011c05fe27601f6eb82f872160 Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Tue, 18 Jun 2013 17:18:46 -0700
Subject: [PATCH 2/4] 8016780: README-builds.html misses crucial requirement on
 bootstrap JDK

Reviewed-by: dholmes, chegar
---
 README-builds.html | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/README-builds.html b/README-builds.html
index 9a52859f8c2..5573c8cd2f1 100644
--- a/README-builds.html
+++ b/README-builds.html
@@ -355,12 +355,24 @@
                     </li>
                     <li>
                         Install a
-                        <a name="bootjdk">Bootstrap JDK</a>
-                        <br>
+                        <a name="bootjdk">Bootstrap JDK</a>.
                         All OpenJDK builds require access to a previously released
-                        JDK, this is often called a bootstrap JDK.
-                        Currently, for this JDK release we require
-                        JDK 7 Update 7 or newer.
+                        JDK called the <i>bootstrap JDK</i> or <i>boot JDK.</i>
+                        The general rule is that the bootstrap JDK
+                        must be an instance of the previous major
+                        release of the JDK. In addition, there may be
+                        a requirement to use a release at or beyond a
+                        particular update level.
+                        <br>&nbsp;<br>
+
+                        <b><i>Building JDK 8 requires use of a version
+                        of JDK 7 that is at Update 7 or newer. JDK 8
+                        developers should not use JDK 8 as the boot
+                        JDK, to ensure that JDK 8 dependencies are
+                        not introduced into the parts of the system
+                        that are built with JDK 7.</i></b>
+
+                        <br>&nbsp;<br>
                         The JDK 7 binaries can be downloaded from Oracle's 
                         <a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
                            target="_blank">JDK 7 download site</a>.

From b92c0f4da7ac4f2a28358ee20bd20e72fc884c33 Mon Sep 17 00:00:00 2001
From: David Katleman <katleman@openjdk.org>
Date: Thu, 20 Jun 2013 10:16:25 -0700
Subject: [PATCH 3/4] Added tag jdk8-b95 for changeset 0229eabb2693

---
 .hgtags-top-repo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 22bffa459a6..60298ea543b 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -216,3 +216,4 @@ cb51fb4789ac0b8be4056482077ddfb8f3bd3805 jdk8-b91
 3a36c926a7aafa9d4a892a45ef3678e87ad8359b jdk8-b92
 27c51c6e31c1ef36afa0e6efb031f9b13f26c12b jdk8-b93
 50d2bde060f2a9bbbe4da0c8986e20aca61f2e2e jdk8-b94
+785d07fe38901ecc1b7e0145e53e1c3da9361fee jdk8-b95

From 10f98044f8ade74c8ad8c76dc2440b0ffc2f0f95 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Tue, 25 Jun 2013 09:37:46 +0200
Subject: [PATCH 4/4] 8012564: The SOURCE value in release file of JDK 8
 doesn't contain valid changesets for some OS since b74

Reviewed-by: alanb, tbell
---
 common/makefiles/Main.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk
index 0120c1f33f3..6cfcfa84387 100644
--- a/common/makefiles/Main.gmk
+++ b/common/makefiles/Main.gmk
@@ -192,7 +192,7 @@ source-tips: $(OUTPUT_ROOT)/source_tips
 $(OUTPUT_ROOT)/source_tips: FRC
 	@$(MKDIR) -p $(@D)
 	@$(RM) $@
-	@$(if $(HG),$(call GetSourceTips),$(ECHO) "hg not installed" > $@)
+	@$(call GetSourceTips)
 
 
 # Remove everything, except the output from configure.