From 52dac61212e5f7907c50e324320ee108e15ace79 Mon Sep 17 00:00:00 2001
From: Paul Klingaman <paulk@openjdk.org>
Date: Mon, 14 Feb 2011 14:29:10 -0500
Subject: [PATCH 1/3] 7019371: JDK7 is not building UPX. IFTW wrappers are not
 compressed

Reviewed-by: billyh, jqzuo
---
 make/deploy-rules.gmk | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk
index 1308d51518b..d05d4097e3c 100644
--- a/make/deploy-rules.gmk
+++ b/make/deploy-rules.gmk
@@ -64,19 +64,17 @@ ifneq ($(JQS), off)
     endif
   endif
 endif
-  
-ifneq ($(KERNEL), off)
-  ifeq ($(ARCH_DATA_MODEL), 32)
-    ifeq ($(PLATFORM), windows)
-      # Only set up to use UPX compression if it is available
-      UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
-        $(ECHO) true ; \
-      else \
-        $(ECHO) false ; \
-      fi )
-      ifeq ($(UP_TMP), true)
-        DEPLOY_BUILD_TARGETS += cmd-comp-all
-      endif
+
+ifeq ($(ARCH_DATA_MODEL), 32)
+  ifeq ($(PLATFORM), windows)
+    # Only set up to use UPX compression if it is available
+    UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
+      $(ECHO) true ; \
+    else \
+      $(ECHO) false ; \
+    fi )
+    ifeq ($(UP_TMP), true)
+      DEPLOY_BUILD_TARGETS += cmd-comp-all
     endif
   endif
 endif

From 932f3af0eb865e3436062bdd9ae12603945e701f Mon Sep 17 00:00:00 2001
From: Kelly O'Hair <ohair@openjdk.org>
Date: Wed, 16 Feb 2011 13:29:01 -0800
Subject: [PATCH 2/3] 7013964: openjdk LICENSE file needs rebranding

Reviewed-by: darcy, katleman, jjg
---
 LICENSE | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/LICENSE b/LICENSE
index eeab58c21c9..b40a0f457d7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -325,11 +325,11 @@ License instead of this License.
 
 "CLASSPATH" EXCEPTION TO THE GPL
 
-Certain source files distributed by Sun Microsystems, Inc.  are subject to
-the following clarification and special exception to the GPL, but only where
-Sun has expressly included in the particular source file's header the words
-"Sun designates this particular file as subject to the "Classpath" exception
-as provided by Sun in the LICENSE file that accompanied this code."
+Certain source files distributed by Oracle America and/or its affiliates are
+subject to the following clarification and special exception to the GPL, but
+only where Oracle has expressly included in the particular source file's header
+the words "Oracle designates this particular file as subject to the "Classpath"
+exception as provided by Oracle in the LICENSE file that accompanied this code."
 
     Linking this library statically or dynamically with other modules is making
     a combined work based on this library.  Thus, the terms and conditions of

From edcd96a12953320e2b2af28ee4601c36a8cc0145 Mon Sep 17 00:00:00 2001
From: Christine Lu <cl@openjdk.org>
Date: Fri, 18 Feb 2011 14:23:28 -0800
Subject: [PATCH 3/3] Added tag jdk7-b130 for changeset 00d174cbd0bb

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

diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 4fe77eb16d4..b6d73caeb29 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -104,3 +104,4 @@ b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126
 bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127
 57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128
 a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129
+cc58c11af15411042719e9c82707fdbef60a9e0f jdk7-b130