[java-1.8.0-openjdk] updated to new sources without eliptic cryptography
jiri vanek
jvanek at fedoraproject.org
Sun Jul 21 17:31:18 UTC 2013
commit 2acb4a2da3d5b3770dc56cd70a13289987945fe2
Author: Jiri Vanek work <jvanek at judovana.home>
Date: Sun Jul 21 19:35:12 2013 +0200
updated to new sources without eliptic cryptography
.gitignore | 2 +
generate_source_tarball.sh | 49 ++++++++++++++++++++++---------------------
java-1.8.0-openjdk.spec | 25 +++++++++++++++++-----
sources | 4 +-
4 files changed, 48 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 523bd9d..fb5e47a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
/jdk8-b89.tar.xz
/jdk8-arm64-b01-internal.tar.xz
/jdk8-b01-internal.tar.xz
+/java-1.8.0-openjdk-aarch64-port-b01-internal.tar.xz
+/java-1.8.0-openjdk-jdk8-b01-internal.tar.xz
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index fef96bf..e8a4f0c 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -1,33 +1,34 @@
#!/bin/bash
-set -e
-
-VERSION=$1
-REV=$2
-JDK8_URL=http://hg.openjdk.java.net/jdk8/jdk8
+#VERSION=$1
+VERSION=01-internal
+JDK8_URL=http://hg.openjdk.java.net
if test "x${VERSION}" = "x"; then
- echo "No version specified. A version is of the form 'jdk8-bXX' (such as 'jdk8-b79')"
+ echo "No version specified. A version XYZ will be used as'jdk8-bXYZ"
exit -1;
fi
-wget -O root.tar.gz ${JDK8_URL}/archive/${VERSION}.tar.gz
-tar xzf root.tar.gz
-rm -f root.tar.gz
-mv jdk8-${VERSION} jdk8
-rm -f jdk8/.hg*
-pushd jdk8
-
-for repos in corba jaxp jaxws langtools hotspot jdk nashorn
-do
- wget -O $repos.tar.gz ${JDK8_URL}/${repos}/archive/${VERSION}.tar.gz
- tar xzf $repos.tar.gz
- rm -f $repos.tar.gz
- mv $repos-${VERSION} $repos
- rm -f $repos/.hg*
-done
+for REPO_NAME in jdk8 aarch64-port
+ do
+ mkdir ${REPO_NAME}
+ pushd ${REPO_NAME}
+
+ REPO_ROOT=${JDK8_URL}/${REPO_NAME}/jdk8
+
+ hg clone ${REPO_ROOT}
+ pushd jdk8
-rm -rvf jdk/src/share//native/sun/security/ec/impl
+ for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
+ do
+ hg clone ${REPO_ROOT}/${subrepo}
+ done
+ rm -rvf jdk/src/share//native/sun/security/ec/impl
-popd
-tar cJf ${VERSION}.tar.xz jdk8
+ popd
+
+ find jdk8 -name ".hg" -exec rm -rf '{}' \;
+ tar cJf java-1.8.0-openjdk-${REPO_NAME}-b${VERSION}.tar.xz jdk8
+
+ popd
+done
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 408d87f..82e53ad 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -1,12 +1,14 @@
# If debug is 1, OpenJDK is built with all debug info present.
%global debug 0
-%global jdk8_version b89
+%global jdk8_build b01
+%global jdk8_version %{jdk8_build}-internal
%global hg_tag jdk8-%{jdk8_version}
%global multilib_arches %{power64} sparc64 x86_64
%global jit_arches %{ix86} x86_64 sparcv9 sparc64
+%global aarch64 aarch64
%ifarch x86_64
%global archbuild amd64
@@ -45,6 +47,11 @@
%global archinstall arm
%global archdef ARM
%endif
+%ifarch %{aarch64}
+%global archbuild aarch64
+%global archinstall aarch64
+%global archdef AARCH64
+%endif
# 32 bit sparc, optimized for v9
%ifarch sparcv9
%global archbuild sparc
@@ -136,7 +143,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 0.9.%{jdk8_version}%{?dist}
+Release: 0.10.%{jdk8_build}%{?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
@@ -154,9 +161,10 @@ License: ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and L
URL: http://openjdk.java.net/
# Source from upstrem OpenJDK8 project. Use
-# './generate_source_tarball.sh %{hg_tag}' to generate. The script merges
-# multiple tarballs into one and removes code not allowed in Fedora.
-Source0: jdk8-%{jdk8_version}.tar.xz
+# './generate_source_tarball.sh %{jdk8_version}' to generate. The script clone
+# repositories of jdk8 and aarch64-port and removes code not allowed in Fedora.
+Source0: java-1.8.0-openjdk-jdk8-%{jdk8_version}.tar.xz
+Source1: java-1.8.0-openjdk-aarch64-port-%{jdk8_version}.tar.xz
# Custom README for -src subpackage
Source2: README.src
@@ -338,8 +346,13 @@ Provides: java8-%{javaver}-javadoc = %{epoch}:%{version}-%{release}
The OpenJDK API documentation.
%prep
+%ifarch %{arm64}
+%global source_num 1
+%else
+%global source_num 0
+%endif
-%setup -q -c -n %{name} -T -a 0
+%setup -q -c -n %{name} -T -a %{source_num}
cp %{SOURCE2} .
# OpenJDK patches
diff --git a/sources b/sources
index f2be2d0..7ae08dc 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-9e1d97e36105a6769735e6a157f7bb53 jdk8-arm64-b01-internal.tar.xz
-95b94860ae0f13b1ab7548de850dc141 jdk8-b01-internal.tar.xz
e1d19c1a7e103b9b3c35a94628ded3b5 desktop-files.tar.gz
94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz
+14dd0d9212080a28fc2ebdf1722aa607 java-1.8.0-openjdk-aarch64-port-b01-internal.tar.xz
+ba47bbce1edaf42bda8dc4557962babc java-1.8.0-openjdk-jdk8-b01-internal.tar.xz
More information about the scm-commits
mailing list