Update to jdk8-b106

.gitignore

@@ -13,3 +13,4 @@
 /aarch64-port-b89x.tar.xz
 /jdk8-b89x.tar.xz
 /aarch64-port-aarch64-20130813.tar.xz
+/jdk8-jdk8-b106.tar.xz

fix-jvm-cfg.patch

@@ -1,32 +0,0 @@
---- openjdk/jdk/makefiles/CopyFiles.gmk.orig	2013-08-06 12:47:30.000000000 -0400
-+++ openjdk/jdk/makefiles/CopyFiles.gmk	2013-08-06 13:19:21.000000000 -0400
-@@ -302,7 +302,7 @@
-   # The main problem is deciding whether to use aliases for the VMs that are not
-   # present and the current position is that we add aliases for client and server, but
-   # not for minimal.
--  # To do: should this also support, -zero and -zeroshark?
-+  # To do: should this also support -zeroshark?
- 
-   CLIENT_AND_SERVER := $(and $(findstring true,$(JVM_VARIANT_SERVER)),$(findstring true,$(JVM_VARIANT_CLIENT)))
- 
-@@ -335,6 +335,11 @@
- 	        $(PRINTF) "-minimal KNOWN\n">>$(@)
- 	        $(PRINTF) "-server ALIASED_TO -minimal\n">>$(@)
- 	        $(PRINTF) "-client ALIASED_TO -minimal\n">>$(@)
-+            else
-+                ifeq ($(JVM_VARIANT_ZERO),true)
-+	            $(PRINTF) "-server KNOWN\n">>$(@)
-+	            $(PRINTF) "-client IGNORED\n">>$(@)
-+                endif
-             endif
-         endif
-     endif
-@@ -346,6 +351,8 @@
- 	$(call install-file)
- endif
- 
-+
-+
- COPY_FILES += $(JVMCFG)
- 
- ##########################################################################################

generate_source_tarball.sh

@@ -1,51 +1,57 @@
 #!/bin/bash
 
+# Generates the 'source tarball' for JDK 8 projects.
+#
+# Usage: generate_source_tarball.sh repo_name tag
+#
+# Examples:
+#   ./generate_source_tarball.sh jdk8 jdk8-b79
+#   ./generate_source_tarball.sh aarch64-port aarch64-${DATE}
+#
+# This script creates a single source tarball out of the repository
+# based on the given tag and removes code not allowed in fedora.
+
 set -e
 
-VERSION=$1
+REPO_NAME="$1"
+VERSION="$2"
 JDK8_URL=http://hg.openjdk.java.net
 
-if test "x${VERSION}" = "x"; then
+if [[ "${REPO_NAME}" = "" ]] ; then
-    echo "No version specified. A version is of the form 'jdk8-bXX' (such as 'jdk8-b79')"
+    echo "No repository specified."
+    exit -1
+fi
+if [[ "${VERSION}" = "" ]]; then
+    echo "No version/tag specified."
     exit -1;
 fi
 
-#for REPO_NAME in jdk8 aarch64-port
+mkdir "${REPO_NAME}"
-for REPO_NAME in aarch64-port
+pushd "${REPO_NAME}"
-do
-    mkdir ${REPO_NAME}
-    pushd ${REPO_NAME}
 
-    REPO_ROOT=${JDK8_URL}/${REPO_NAME}/jdk8
+REPO_ROOT="${JDK8_URL}/${REPO_NAME}/jdk8"
 
-    if [[ "$REPO_NAME" == "aarch64-port" ]] ; then
+wget "${REPO_ROOT}/archive/${VERSION}.tar.gz"
-        # aarch64-port does not tag trees
+tar xf "${VERSION}.tar.gz"
-        # FIXME make this clone reproducible
+rm  "${VERSION}.tar.gz"
-        hg clone ${REPO_ROOT} -r ${VERSION}
+
-    else
+mv "jdk8-${VERSION}" jdk8
-        hg clone ${REPO_ROOT} -r ${VERSION}
-    fi
 pushd jdk8
 
-#    for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn common
-#    it looks like commons have been added as separate repo for jdk8
-#    but not yet for aarch64-port
 for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
 do
-        if [[ "$REPO_NAME" == "aarch64-port" ]] ; then
+    wget "${REPO_ROOT}/${subrepo}/archive/${VERSION}.tar.gz"
-            # aarch64-port does not tag trees
+    tar xf "${VERSION}.tar.gz"
-            # FIXME make this clone reproducible
+    rm "${VERSION}.tar.gz"
-            hg clone ${REPO_ROOT}/${subrepo}
+    mv "${subrepo}-${VERSION}" "${subrepo}"
-        else
-            hg clone ${REPO_ROOT}/${subrepo} -r ${VERSION}
-        fi
 done
-    rm -rvf jdk/src/share/native/sun/security/ec/impl || echo ok
+
+rm -vr jdk/src/share/native/sun/security/ec/impl
 
 popd
 
-    find jdk8 -type d -name ".hg" -exec rm -rf '{}' \; || echo ok
 tar cJf ${REPO_NAME}-${VERSION}.tar.xz jdk8
 
 popd
-done
+
+mv "${REPO_NAME}/${REPO_NAME}-${VERSION}.tar.xz" .

java-1.8.0-openjdk.spec

@@ -1,7 +1,7 @@
 # If debug is 1, OpenJDK is built with all debug info present.
 %global debug 0
 
-%global jdk8_version b89x
+%global jdk8_version b106
 %global hg_tag jdk8-%{jdk8_version}
 %global aarch64_hg_tag aarch64-20130813
 
@@ -125,7 +125,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.17.%{jdk8_version}%{?dist}
+Release: 0.18.%{jdk8_version}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -142,11 +142,10 @@ Group:   Development/Languages
 License:  ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and LGPL+ and LGPLv2 and MPLv1.0 and MPLv1.1 and Public Domain and W3C
 URL:      http://openjdk.java.net/
 
-# Source from upstrem OpenJDK8 project. Use 
+# Source from upstrem OpenJDK8 project. To regenerate, use
-# './generate_source_tarball.sh %{hg_tag|aarch64_hg_tag}' to generate.
+# ./generate_source_tarball.sh jdk8 %{hg_tag}
-# The script clones repositories of jdk8 and aarch64-port and removes 
+# ./generate_source_tarball.sh aarch64-port %{aarch64_hg_tag}
-# code not allowed in Fedora.
+Source0:  jdk8-%{hg_tag}.tar.xz
-Source0:  jdk8-%{jdk8_version}.tar.xz
 Source1:  aarch64-port-%{aarch64_hg_tag}.tar.xz
 
 # Custom README for -src subpackage
@@ -195,8 +194,6 @@ Patch202: system-libpng.patch
 Patch203: system-lcms.patch
 Patch2031: system-lcmsAARCH64.patch
 
-Patch301: fix-jvm-cfg.patch
-
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: alsa-lib-devel
@@ -378,14 +375,6 @@ sh %{SOURCE12}
 %patch103
 %endif
 
-%ifnarch %{aarch64}
-
-pushd jdk8
-%patch301 -p1
-popd
-
-%endif
-
 # Extract systemtap tapsets
 %if %{with_systemtap}
 
@@ -926,6 +915,9 @@ exit 0
 %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
 
 %changelog
+* Thu Sep 05 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.18.b106
+- Update to jdk8-b106
+
 * Tue Aug 13 2013 Deepak Bhole <dbhole@redhat.com> - 1:1.8.0.0-0.17.b89x
 - Updated aarch64 to latest head
 - Dropped upstreamed patches

sources

@@ -1,4 +1,4 @@
-94ca5a45c3cb3b85c4577d0891166007  systemtap-tapset.tar.gz
-e1d19c1a7e103b9b3c35a94628ded3b5  desktop-files.tar.gz
-ba47bbce1edaf42bda8dc4557962babc  jdk8-b89x.tar.xz
 100508e1b8fa8653525e0454f29a9fd8  aarch64-port-aarch64-20130813.tar.xz
+e1d19c1a7e103b9b3c35a94628ded3b5  desktop-files.tar.gz
+f9b9b585a6dcd059dfe53f5e762dcccd  jdk8-jdk8-b106.tar.xz
+94ca5a45c3cb3b85c4577d0891166007  systemtap-tapset.tar.gz