jvanek pushed to java-1.7.0-openjdk (f20). "Bump to 2.5.5 using OpenJDK 7u79 b14. (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 15 06:29:05 UTC 2015
>From 26ac3d0c05b813eb647fb235747e416a61f8fa51 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek at redhat.com>
Date: Wed, 15 Apr 2015 08:28:35 +0200
Subject: Bump to 2.5.5 using OpenJDK 7u79 b14. - Update OpenJDK tarball
creation comments - Drop AArch64 version of RH1191652 HotSpot patch as
included upstream. - added Patch406: fixPtraceInclude.patch, Patch404:
rh1191652-hotspot.patch Patch405: rh1191652-jdk.patch
diff --git a/.gitignore b/.gitignore
index dcfe602..afd427c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,8 +51,12 @@
/openjdk-icedtea-2.5.0.tar.xz
/jdk7u60_b30_aarch64_360d11d249a6.tar.bz2
/openjdk-icedtea-2.5.1.tar.xz
-/openjdk-icedtea-2.5.2.tar.xz
+/b59d2e4fec44.tar.bz2
+/aarch64-hotspot-116bc9da35de.tar.bz2
/openjdk-icedtea-2.5.3.tar.xz
+/jdk7u60_b04_aarch64_834.tar.bz2
/jdk7u80_b03_aarch64_hotspot-39befa03b58a.tar.bz2
/openjdk-icedtea-2.5.4.tar.xz
/aarch64-icedtea-2.6pre17.tar.bz2
+/openjdk-icedtea-2.5.5.tar.xz
+/aarch64-icedtea-2.6pre21.tar.bz2
diff --git a/fixPtraceInclude.patch b/fixPtraceInclude.patch
new file mode 100644
index 0000000..d65127a
--- /dev/null
+++ b/fixPtraceInclude.patch
@@ -0,0 +1,11 @@
+--- openjdk/hotspot/agent/src/os/linux/libproc.h 2014-06-20 12:44:51.123266885 -0700
++++ openjdk/hotspot/agent/src/os/linux/libproc.h 2014-06-20 12:44:50.554244278 -0700
+@@ -34,7 +34,7 @@
+ #include "libproc_md.h"
+ #endif
+
+-#include <linux/ptrace.h>
++#include <sys/ptrace.h>
+
+ /************************************************************************************
+
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 44706af..64b04d3 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -1,11 +1,11 @@
# If debug is 1, OpenJDK is built with all debug info present.
%global debug 0
-%global icedtea_version 2.5.4
+%global icedtea_version 2.5.5
%global hg_tag icedtea-{icedtea_version}
-%global aarch64_rev 4d25046abb67
-%global aarch64_tag icedtea-2.6pre17
+%global aarch64_rev 1939c010fd37
+%global aarch64_tag icedtea-2.6pre21
%global aarch64 aarch64 arm64 armv8
#sometimes we need to distinguish big and little endian PPC64
@@ -14,7 +14,7 @@
%global multilib_arches %{power64} sparc64 x86_64
%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{ppc64be} %{ppc64le} %{aarch64}
-# With diabled nss is NSS deactivated, so in NSS_LIBDIR can be wrong path
+# With disabled nss is NSS deactivated, so in NSS_LIBDIR can be wrong path
# the initialisation must be here. LAter the pkg-connfig have bugy behaviour
#looks liekopenjdk RPM specific bug
# Always set this so the nss.cfg file is not broken
@@ -43,8 +43,8 @@
%global archdef PPC
%endif
%ifarch %{ppc64le}
-%global archbuild ppc64
-%global archinstall ppc64
+%global archbuild ppc64le
+%global archinstall ppc64le
%global archdef PPC64
%endif
%ifarch %{ix86}
@@ -96,16 +96,16 @@
%global debugbuild %{nil}
%endif
+# If hsbootstrap is 1, build HotSpot alone first and use that in the bootstrap JDK
+# You can turn this on to avoid issues where HotSpot is broken in the bootstrap JDK
+%global hsbootstrap 0
+
%if %{debug}
%global buildoutputdir openjdk/build/linux-%{archbuild}-debug
%else
%global buildoutputdir openjdk/build/linux-%{archbuild}
%endif
-%ifnarch %{ppc64le}
%global with_pulseaudio 1
-%else
-%global with_pulseaudio 0
-%endif
%ifarch %{jit_arches}
%global with_systemtap 1
@@ -132,10 +132,10 @@
# Standard JPackage naming and versioning defines.
%global origin openjdk
-%global updatever 75
-%global buildver 13
-# Keep priority on 6digits in case updatever>9
-%global priority 1700%{updatever}
+%global updatever 79
+%global buildver 14
+# Keep priority on 7digits in case updatever>9
+%global priority 17000%{updatever}
%global javaver 1.7.0
%global sdkdir %{uniquesuffix}
@@ -177,7 +177,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}
-Release: %{icedtea_version}.2%{?dist}
+Release: %{icedtea_version}.0%{?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
@@ -206,10 +206,10 @@ URL: http://openjdk.java.net/
# hg clone $REPO/jdk/ openjdk/jdk -r %{hg_tag}
# hg clone $REPO/langtools/ openjdk/langtools -r %{hg_tag}
# find openjdk -name ".hg" -exec rm -rf '{}' \;
-# sh /git/java-1.7.0-openjdk/rhel-7.0/fsg.sh
+# sh /git/java-1.7.0-openjdk/rhel-7.1/fsg.sh
# tar cJf openjdk-icedtea-%{icedtea_version}.tar.xz openjdk
Source0: openjdk-icedtea-%{icedtea_version}.tar.xz
-# wget -v -O %{aarch64_tag}.tar.bz2 http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot/archive/%{aarch64_rev}.tar.bz2
+# wget -v -O %{aarch64_tag}.tar.bz2 http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/%{aarch64_rev}.tar.bz2
Source1: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/%{aarch64_rev}.tar.bz2#/aarch64-%{aarch64_tag}.tar.bz2
# README file
@@ -293,6 +293,13 @@ Patch400: rh1022017.patch
#Workaround RH902004
Patch403: PStack-808293.patch
+
+# Use ppc64le as arch name on ppc64le, not ppc64
+# Remove when we move to IcedTea 2.6.x
+Patch404: rh1191652-hotspot.patch
+Patch405: rh1191652-jdk.patch
+
+Patch406: fixPtraceInclude.patch
# End of tmp patches
BuildRequires: autoconf
@@ -498,6 +505,12 @@ Although working pretty fine, there are known issues with accessibility on, so d
%prep
%setup -q -c -n %{uniquesuffix} -T -a 0
+# https://bugzilla.redhat.com/show_bug.cgi?id=1189084
+prioritylength=`expr length %{priority}`
+if [ $prioritylength -ne 7 ] ; then
+ echo "priority must be 7 digits in total, violated"
+ exit 14
+fi
cp %{SOURCE2} .
%ifarch %{aarch64}
@@ -507,6 +520,7 @@ tar xf %{SOURCE1}
mv hotspot-%{aarch64_rev} hotspot
popd
%endif
+%patch406
# OpenJDK patches
%patch100
@@ -569,6 +583,12 @@ tar xzf %{SOURCE9}
%patch200
%patch403
+# HotSpot ppc64le patch is applied upstream
+# on AArch64/2.6.x HotSpot.
+%ifnarch %{aarch64}
+%patch404
+%endif
+%patch405
%build
# How many cpu's do we have?
@@ -677,7 +697,7 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
# Install java-abrt-luncher
mkdir $JAVA_HOME/jre-abrt
mkdir $JAVA_HOME/jre-abrt/bin
-mv $JAVA_HOME/jre/bin/java $JAVA_HOME/jre-abrt/bin/java
+mv $JAVA_HOME/jre/bin/java $JAVA_HOME/jre-abrt/bin/java
ln -s %{_jvmdir}/%{sdkdir}/jre/lib $JAVA_HOME/jre-abrt/lib
cat %{SOURCE13} | sed -e s:@JAVA_PATH@:%{_jvmdir}/%{sdkdir}/jre-abrt/bin/java:g -e s:@LIB_DIR@:%{LIBDIR}/libabrt-java-connector.so:g > $JAVA_HOME/jre/bin/java
chmod 755 $JAVA_HOME/jre/bin/java
@@ -1563,6 +1583,17 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog
+* Fri Apr 10 2015 Jiri Vanek <jvanek at redhat.com> - 1:1.7.0.75-2.5.5.0
+- repacked sources
+
+* Thu Apr 09 2015 Jiri Vanek <jvanek at redhat.com> - 1:1.7.0.75-2.5.5.0
+- Bump to 2.5.5 using OpenJDK 7u79 b14.
+- Update OpenJDK tarball creation comments
+- Drop AArch64 version of RH1191652 HotSpot patch as included upstream.
+- added Patch406: fixPtraceInclude.patch, Patch404: rh1191652-hotspot.patch
+ Patch405: rh1191652-jdk.patch
+
+
* Wed Jan 21 2015 Jiri Vanek <jvanek at redhat.com> - 1:1.7.0.75-2.5.4.2
- Updated to security update of 20.1.2015
- Replace unmodified java.security file via headless post scriptlet.
diff --git a/rh1191652-hotspot.patch b/rh1191652-hotspot.patch
new file mode 100644
index 0000000..d52f7bd
--- /dev/null
+++ b/rh1191652-hotspot.patch
@@ -0,0 +1,32 @@
+diff -r bbda609c9d24 make/defs.make
+--- openjdk/hotspot/make/defs.make Tue Jan 27 00:46:17 2015 +0000
++++ openjdk/hotspot/make/defs.make Fri Feb 13 09:49:46 2015 +0000
+@@ -304,6 +304,13 @@
+ LIBARCH/arm = arm
+ LIBARCH/zero = $(ZERO_LIBARCH)
+
++ # Override LIBARCH for ppc64le
++ ifeq ($(ARCH), ppc64)
++ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN), little)
++ LIBARCH = ppc64le
++ endif
++ endif
++
+ LP64_ARCH = sparcv9 amd64 ia64 ppc64 zero
+ endif
+
+diff -r bbda609c9d24 src/os/linux/vm/os_linux.cpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue Jan 27 00:46:17 2015 +0000
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Fri Feb 13 09:49:46 2015 +0000
+@@ -301,7 +301,11 @@
+ #elif defined(PPC32)
+ static char cpu_arch[] = "ppc";
+ #elif defined(PPC64)
++#if defined(VM_LITTLE_ENDIAN)
++static char cpu_arch[] = "ppc64le";
++#else
+ static char cpu_arch[] = "ppc64";
++#endif
+ #elif defined(SPARC)
+ # ifdef _LP64
+ static char cpu_arch[] = "sparcv9";
diff --git a/rh1191652-jdk.patch b/rh1191652-jdk.patch
new file mode 100644
index 0000000..d858525
--- /dev/null
+++ b/rh1191652-jdk.patch
@@ -0,0 +1,96 @@
+diff -r e1bfd77b6e1a make/common/Defs-linux.gmk
+--- openjdk/jdk/make/common/Defs-linux.gmk Tue Jan 27 02:53:44 2015 +0000
++++ openjdk/jdk/make/common/Defs-linux.gmk Fri Feb 13 12:42:28 2015 +0000
+@@ -199,16 +199,9 @@
+ CFLAGS_REQUIRED_mips +=
+ CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_ppc += -m32 -fsigned-char -D_BIG_ENDIAN
+-ifeq ($(ARCH),ppc64)
+- ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big)
+- CFLAGS_REQUIRED_ppc64 += -m64 -D_BIG_ENDIAN
+- LDFLAGS_COMMON_ppc64 += -m64 -L/lib64 -Wl,-melf64ppc
+- else ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),little)
+- CFLAGS_REQUIRED_ppc64 += -D_LITTLE_ENDIAN -DABI_ELFv2
+- else
+- $(error Expected big/little for ARCH=ppc64, got OPENJDK_TARGET_CPU_ENDIAN=$(OPENJDK_TARGET_CPU_ENDIAN))
+- endif
+-endif
++CFLAGS_REQUIRED_ppc64 += -m64 -D_BIG_ENDIAN
++LDFLAGS_COMMON_ppc64 += -m64 -L/lib64 -Wl,-melf64ppc
++CFLAGS_REQUIRED_ppc64le += -D_LITTLE_ENDIAN -DABI_ELFv2
+ CFLAGS_REQUIRED_s390 +=
+ CFLAGS_REQUIRED_s390x += -m64
+ CFLAGS_REQUIRED_sh += -mieee
+diff -r e1bfd77b6e1a make/common/shared/Platform.gmk
+--- openjdk/jdk/make/common/shared/Platform.gmk Tue Jan 27 02:53:44 2015 +0000
++++ openjdk/jdk/make/common/shared/Platform.gmk Fri Feb 13 12:42:28 2015 +0000
+@@ -217,7 +217,6 @@
+ else ifeq ($(ARCH), ppc64le)
+ ARCH_DATA_MODEL=64
+ OPENJDK_TARGET_CPU_ENDIAN=little
+- ARCH := ppc64
+ else
+ # Most archs are 32-bit
+ ifndef ARCH_DATA_MODEL
+diff -r e1bfd77b6e1a make/javax/sound/SoundDefs.gmk
+--- openjdk/jdk/make/javax/sound/SoundDefs.gmk Tue Jan 27 02:53:44 2015 +0000
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk Fri Feb 13 12:42:28 2015 +0000
+@@ -110,6 +110,10 @@
+ CPPFLAGS += -DX_ARCH=X_PPC64
+ endif # ARCH ppc64
+
++ ifeq ($(ARCH), ppc64le)
++ CPPFLAGS += -DX_ARCH=X_PPC64LE
++ endif # ARCH ppc64le
++
+ ifeq ($(ARCH), s390)
+ CPPFLAGS += -DX_ARCH=X_S390
+ endif # ARCH s390
+diff -r e1bfd77b6e1a src/share/native/com/sun/media/sound/SoundDefs.h
+--- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Tue Jan 27 02:53:44 2015 +0000
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Fri Feb 13 12:42:28 2015 +0000
+@@ -52,6 +52,7 @@
+ #define X_S390X 15
+ #define X_SH 16
+ #define X_AARCH64 17
++#define X_PPC64LE 18
+
+ // **********************************
+ // Make sure you set X_PLATFORM and X_ARCH defines correctly.
+diff -r e1bfd77b6e1a src/solaris/bin/ppc64le/jvm.cfg
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg Fri Feb 13 12:42:28 2015 +0000
+@@ -0,0 +1,33 @@
++# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++# List of JVMs that can be used as an option to java, javac, etc.
++# Order is important -- first in this list is the default JVM.
++# NOTE that this both this file and its format are UNSUPPORTED and
++# WILL GO AWAY in a future release.
++#
++# You may also select a JVM in an arbitrary location with the
++# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
++# and may not be available in a future release.
++#
++-server KNOWN
diff --git a/sources b/sources
index 43f9d78..feac9d3 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz
-334ff0b53faff6ee1d718194bbf6b806 openjdk-icedtea-2.5.4.tar.xz
+0b1e285610b1b9bd0eaaba79dbb739e2 openjdk-icedtea-2.5.5.tar.xz
1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz
013ddff65e090aafe9ff89d4ce767e8d systemtap-tapset-2014-03-19.tar.xz
-b81828aaccf3e7f6d6dafb78d67709f2 aarch64-icedtea-2.6pre17.tar.bz2
+7a8d425cfb4f29afde055059393d4963 aarch64-icedtea-2.6pre21.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/java-1.7.0-openjdk.git/commit/?h=f20&id=26ac3d0c05b813eb647fb235747e416a61f8fa51
More information about the scm-commits
mailing list