Pushed changes of Omair Majid which improved handling of sources
This commit is contained in:
parent
b78bd3d2b6
commit
e19dadab5a
@ -1,34 +1,47 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
#VERSION=$1
|
set -e
|
||||||
VERSION=01-internal
|
|
||||||
|
VERSION=$1
|
||||||
JDK8_URL=http://hg.openjdk.java.net
|
JDK8_URL=http://hg.openjdk.java.net
|
||||||
|
|
||||||
if test "x${VERSION}" = "x"; then
|
if test "x${VERSION}" = "x"; then
|
||||||
echo "No version specified. A version XYZ will be used as'jdk8-bXYZ"
|
echo "No version specified. A version is of the form 'jdk8-bXX' (such as 'jdk8-b79')"
|
||||||
exit -1;
|
exit -1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for REPO_NAME in jdk8 aarch64-port
|
for REPO_NAME in jdk8 aarch64-port
|
||||||
do
|
do
|
||||||
mkdir ${REPO_NAME}
|
mkdir ${REPO_NAME}
|
||||||
pushd ${REPO_NAME}
|
pushd ${REPO_NAME}
|
||||||
|
|
||||||
REPO_ROOT=${JDK8_URL}/${REPO_NAME}/jdk8
|
|
||||||
|
|
||||||
hg clone ${REPO_ROOT}
|
REPO_ROOT=${JDK8_URL}/${REPO_NAME}/jdk8
|
||||||
pushd jdk8
|
|
||||||
|
|
||||||
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
|
if [[ "$REPO_NAME" == "aarch64-port" ]] ; then
|
||||||
do
|
# aarch64-port does not tag trees
|
||||||
hg clone ${REPO_ROOT}/${subrepo}
|
# FIXME make this clone reproducible
|
||||||
done
|
hg clone ${REPO_ROOT}
|
||||||
rm -rvf jdk/src/share//native/sun/security/ec/impl
|
else
|
||||||
|
hg clone ${REPO_ROOT} -r ${VERSION}
|
||||||
|
fi
|
||||||
|
pushd jdk8
|
||||||
|
|
||||||
popd
|
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
|
||||||
|
do
|
||||||
|
if [[ "$REPO_NAME" == "aarch64-port" ]] ; then
|
||||||
|
# aarch64-port does not tag trees
|
||||||
|
# FIXME make this clone reproducible
|
||||||
|
hg clone ${REPO_ROOT}/${subrepo}
|
||||||
|
else
|
||||||
|
hg clone ${REPO_ROOT}/${subrepo} -r ${VERSION}
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
rm -rvf jdk/src/share/native/sun/security/ec/impl || echo ok
|
||||||
|
|
||||||
find jdk8 -name ".hg" -exec rm -rf '{}' \;
|
popd
|
||||||
tar cJf java-1.8.0-openjdk-${REPO_NAME}-b${VERSION}.tar.xz jdk8
|
|
||||||
|
|
||||||
popd
|
find jdk8 -type d -name ".hg" -exec rm -rf '{}' \; || echo ok
|
||||||
|
tar cJf ${REPO_NAME}-b${VERSION}.tar.xz jdk8
|
||||||
|
|
||||||
|
popd
|
||||||
done
|
done
|
||||||
|
@ -1,14 +1,13 @@
|
|||||||
# If debug is 1, OpenJDK is built with all debug info present.
|
# If debug is 1, OpenJDK is built with all debug info present.
|
||||||
%global debug 0
|
%global debug 0
|
||||||
|
|
||||||
%global jdk8_build b01
|
%global jdk8_version b89
|
||||||
%global jdk8_version %{jdk8_build}-internal
|
|
||||||
%global hg_tag jdk8-%{jdk8_version}
|
%global hg_tag jdk8-%{jdk8_version}
|
||||||
|
|
||||||
%global multilib_arches %{power64} sparc64 x86_64
|
%global multilib_arches %{power64} sparc64 x86_64
|
||||||
|
|
||||||
%global jit_arches %{ix86} x86_64 sparcv9 sparc64
|
%global jit_arches %{ix86} x86_64 sparcv9 sparc64
|
||||||
%global aarch64 aarch64 arm64 armv8
|
%global aarch64 aarch64 arm64 armv8
|
||||||
|
|
||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
%global archbuild amd64
|
%global archbuild amd64
|
||||||
@ -143,7 +142,7 @@
|
|||||||
|
|
||||||
Name: java-%{javaver}-%{origin}
|
Name: java-%{javaver}-%{origin}
|
||||||
Version: %{javaver}.%{buildver}
|
Version: %{javaver}.%{buildver}
|
||||||
Release: 0.10.%{jdk8_build}%{?dist}
|
Release: 0.10.%{jdk8_version}%{?dist}
|
||||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
|
# 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
|
# 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
|
# also included the epoch in their virtual provides. This created a
|
||||||
@ -161,10 +160,10 @@ License: ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and L
|
|||||||
URL: http://openjdk.java.net/
|
URL: http://openjdk.java.net/
|
||||||
|
|
||||||
# Source from upstrem OpenJDK8 project. Use
|
# Source from upstrem OpenJDK8 project. Use
|
||||||
# './generate_source_tarball.sh %{jdk8_version}' to generate. The script clone
|
# './generate_source_tarball.sh %{hg_tag}' to generate. The script clones
|
||||||
# repositories of jdk8 and aarch64-port and removes code not allowed in Fedora.
|
# repositories of jdk8 and aarch64-port and removes code not allowed in Fedora.
|
||||||
Source0: java-1.8.0-openjdk-jdk8-%{jdk8_version}.tar.xz
|
Source0: jdk8-%{jdk8_version}.tar.xz
|
||||||
Source1: java-1.8.0-openjdk-aarch64-port-%{jdk8_version}.tar.xz
|
Source1: aarch64-port-%{jdk8_version}.tar.xz
|
||||||
|
|
||||||
# Custom README for -src subpackage
|
# Custom README for -src subpackage
|
||||||
Source2: README.src
|
Source2: README.src
|
||||||
@ -914,6 +913,12 @@ exit 0
|
|||||||
%doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
|
%doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 23 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.10.b89
|
||||||
|
- Moved to hg clone for generating sources.
|
||||||
|
|
||||||
|
* Sun Jul 21 2013 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.0-0.9.b89
|
||||||
|
- added aarch 64 tarball, proposed usage of clone instead of tarballs
|
||||||
|
|
||||||
* Mon Jul 15 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.9.b89
|
* Mon Jul 15 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.9.b89
|
||||||
- Switch to xz for compression
|
- Switch to xz for compression
|
||||||
- Fixes RHBZ#979823
|
- Fixes RHBZ#979823
|
||||||
|
4
sources
4
sources
@ -1,4 +1,4 @@
|
|||||||
e1d19c1a7e103b9b3c35a94628ded3b5 desktop-files.tar.gz
|
e1d19c1a7e103b9b3c35a94628ded3b5 desktop-files.tar.gz
|
||||||
94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz
|
94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz
|
||||||
14dd0d9212080a28fc2ebdf1722aa607 java-1.8.0-openjdk-aarch64-port-b01-internal.tar.xz
|
225cb0f1e87a57f7a1a69d19297981e3 jdk8-b89.tar.xz
|
||||||
ba47bbce1edaf42bda8dc4557962babc java-1.8.0-openjdk-jdk8-b01-internal.tar.xz
|
225cb0f1e87a57f7a1a69d19297981e3 jdk8-b89.tar.xz
|
||||||
|
Loading…
Reference in New Issue
Block a user