[openjdk-8] 02/04: Support distinct versions for the main release and the aarch64 port
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Apr 16 17:29:43 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository openjdk-8.
commit 3f65e37b118145367c92241e16caad7d240b5716
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Apr 16 18:30:44 2014 +0200
Support distinct versions for the main release and the aarch64 port
---
debian/generate_source_tarball.sh | 47 +++++++++++++++++++++++----------------
debian/orig-tar.sh | 13 ++++++-----
debian/rules | 10 +++++----
3 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/debian/generate_source_tarball.sh b/debian/generate_source_tarball.sh
index 4d80a28..54259f3 100755
--- a/debian/generate_source_tarball.sh
+++ b/debian/generate_source_tarball.sh
@@ -2,11 +2,12 @@
# Generates the 'source tarball' for JDK 8 projects.
#
-# Usage: generate_source_tarball.sh repo_name tag
+# Usage: generate_source_tarball.sh project_name repo_name tag
#
# Examples:
-# ./generate_source_tarball.sh jdk8 jdk8-b79
-# ./generate_source_tarball.sh aarch64-port aarch64-${DATE}
+# ./generate_source_tarball.sh jdk8 jdk8 jdk8-b79
+# ./generate_source_tarball.sh jdk8u jdk8u jdk8u5-b13
+# ./generate_source_tarball.sh aarch64-port jdk8 aarch64-${DATE}
#
# This script creates a single source tarball out of the repository
# based on the given tag and removes code not allowed in Debian.
@@ -15,45 +16,53 @@
set -e
-REPO_NAME="$1"
-VERSION="$2"
-JDK8_URL=http://hg.openjdk.java.net
+PROJECT_NAME="$1"
+REPO_NAME="$2"
+TAG="$3"
+OPENJDK_URL="http://hg.openjdk.java.net"
+if [[ "${PROJECT_NAME}" = "" ]] ; then
+ echo "No project specified."
+ exit -1
+fi
if [[ "${REPO_NAME}" = "" ]] ; then
echo "No repository specified."
exit -1
fi
-if [[ "${VERSION}" = "" ]]; then
- echo "No version/tag specified."
+if [[ "${TAG}" = "" ]]; then
+ echo "No tag specified."
exit -1;
fi
mkdir -p "${REPO_NAME}"
pushd "${REPO_NAME}"
-REPO_ROOT="${JDK8_URL}/${REPO_NAME}/jdk8"
+REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
-wget "${REPO_ROOT}/archive/${VERSION}.tar.gz"
-tar xf "${VERSION}.tar.gz"
-rm "${VERSION}.tar.gz"
+echo "Downloading the root repository...";
+wget "${REPO_ROOT}/archive/${TAG}.tar.gz"
+tar xf "${TAG}.tar.gz"
+rm "${TAG}.tar.gz"
-mv "jdk8-${VERSION}" jdk8
+mv "${REPO_NAME}-${TAG}" jdk8
pushd jdk8
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
do
- wget "${REPO_ROOT}/${subrepo}/archive/${VERSION}.tar.gz"
- tar xf "${VERSION}.tar.gz"
- rm "${VERSION}.tar.gz"
- mv "${subrepo}-${VERSION}" "${subrepo}"
+ echo "Downloading the ${subrepo} repository...";
+ wget "${REPO_ROOT}/${subrepo}/archive/${TAG}.tar.gz"
+ tar xf "${TAG}.tar.gz"
+ rm "${TAG}.tar.gz"
+ mv "${subrepo}-${TAG}" "${subrepo}"
done
popd
-tar cJf ${REPO_NAME}-${VERSION}.tar.xz jdk8
+echo "Building tarball ${REPO_NAME}-${TAG}.tar.xz..."
+tar cJf ${PROJECT_NAME}-${TAG}.tar.xz jdk8
popd
-mv "${REPO_NAME}/${REPO_NAME}-${VERSION}.tar.xz" .
+mv "${REPO_NAME}/${PROJECT_NAME}-${TAG}.tar.xz" .
rm -Rf ${REPO_NAME}
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index d12102c..cbc42e5 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,15 +1,18 @@
#!/bin/sh -e
VERSION=$2
-VERSION=8~b132
TAR=../openjdk-8_$VERSION.orig.tar.gz
DIR=openjdk8
-BUILDVER=b132
-debian/generate_source_tarball.sh jdk8 jdk8-$BUILDVER
-debian/generate_source_tarball.sh aarch64-port jdk8-$BUILDVER
+# The aarch64 port isn't kept in sync with the main repo, the last version is hardcoded
+AARCH64_VERSION=8-b132
+
+rm $3
+
+debian/generate_source_tarball.sh jdk8u jdk8u jdk$VERSION
+debian/generate_source_tarball.sh aarch64-port jdk8 jdk$AARCH64_VERSION
mkdir $DIR
mv *.tar.xz $DIR
tar -czvf $TAR $DIR
-rm -Rf $DIR $3
+rm -Rf $DIR
diff --git a/debian/rules b/debian/rules
index c52344b..8613e0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,6 +63,9 @@ p_lib_arch = all
jvmver = 1.8.0
shortver = 8
buildver = $(shell echo $(PKGVERSION) | sed -n 's/.*\(b[0-9]\+\).*/\1/p')
+ifneq (,$(filter $(DEB_HOST_ARCH),arm64))
+ buildver = $(shell ls aarch64-port-jdk8* | sed -n 's/.*\(b[0-9]\+\).*/\1/p')
+endif
ifneq (,$(DEB_HOST_MULTIARCH))
jdirname = java-$(shortver)-$(origin)-$(DEB_HOST_ARCH)
jdiralias = java-$(jvmver)-$(origin)-$(DEB_HOST_ARCH)
@@ -832,12 +835,11 @@ unpack: stamps/unpack
stamps/unpack:
mkdir -p stamps;
+ echo "Extracting the sources..."
ifneq (,$(filter $(DEB_HOST_ARCH),arm64))
- echo "Extracting aarch64-port-jdk8-$(buildver).tar.xz..."
- tar -xf aarch64-port-jdk8-$(buildver).tar.xz
+ tar -xf aarch64-port-*.tar.xz
else
- echo "Extracting jdk8-jdk8-$(buildver).tar.xz..."
- tar -xf jdk8-jdk8-$(buildver).tar.xz
+ tar -xf jdk8u-*.tar.xz
endif
mv jdk8/* .
rm -Rf jdk8
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git
More information about the pkg-java-commits
mailing list