From 1ee6bb6eb989308ce7163a42e9d5dab7e3e620e6 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 23 Jul 2013 12:35:30 +0200 Subject: [PATCH] Moved to latest working sources It looks like common repo have diverged from customs and especially is different from aarch64-port --- .gitignore | 2 ++ generate_source_tarball.sh | 5 ++++- java-1.8.0-openjdk.spec | 5 ++++- sources | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 362fb1d..bb7eb40 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ /java-1.8.0-openjdk-aarch64-port-b01-internal.tar.xz /java-1.8.0-openjdk-jdk8-b01-internal.tar.xz /aarch64-port-b89.tar.xz +/aarch64-port-b89x.tar.xz +/jdk8-b89x.tar.xz diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh index 66df0b7..de2696d 100755 --- a/generate_source_tarball.sh +++ b/generate_source_tarball.sh @@ -26,7 +26,10 @@ do fi pushd jdk8 - for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn common +# 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 # aarch64-port does not tag trees diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 6786798..b86c558 100644 --- a/java-1.8.0-openjdk.spec +++ b/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 b89 +%global jdk8_version b89x %global hg_tag jdk8-%{jdk8_version} %global multilib_arches %{power64} sparc64 x86_64 @@ -913,6 +913,9 @@ exit 0 %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE %changelog +* Tue Jul 23 2013 Jiri Vanek - 1:1.8.0.0-0.10.b89 +- moved to latest working osurces + * Tue Jul 23 2013 Omair Majid - 1:1.8.0.0-0.10.b89 - Moved to hg clone for generating sources. diff --git a/sources b/sources index b025a74..fb91165 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -e7342fa14dbd25b751309d703fa08f90 aarch64-port-b89.tar.xz -225cb0f1e87a57f7a1a69d19297981e3 jdk8-b89.tar.xz 94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz e1d19c1a7e103b9b3c35a94628ded3b5 desktop-files.tar.gz +14dd0d9212080a28fc2ebdf1722aa607 aarch64-port-b89x.tar.xz +ba47bbce1edaf42bda8dc4557962babc jdk8-b89x.tar.xz