diff --git a/.gitignore b/.gitignore index 384b786..17a8cb5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -SOURCES/aarch64-icedtea-2.6pre17.tar.bz2 +SOURCES/aarch64-icedtea-2.6pre21.tar.bz2 SOURCES/class-rewriter.tar.gz -SOURCES/openjdk-icedtea-2.5.4.tar.xz +SOURCES/openjdk-icedtea-2.5.5.tar.xz SOURCES/pulseaudio.tar.gz SOURCES/systemtap-tapset-2014-03-19.tar.xz diff --git a/.java-1.7.0-openjdk.metadata b/.java-1.7.0-openjdk.metadata index e84f240..2bcc0b9 100644 --- a/.java-1.7.0-openjdk.metadata +++ b/.java-1.7.0-openjdk.metadata @@ -1,5 +1,5 @@ -3d16547126f4f62b6855dfa49a924ba507b94332 SOURCES/aarch64-icedtea-2.6pre17.tar.bz2 +7a7a7c29d2f7b7d0e18d394e737e878715642fb1 SOURCES/aarch64-icedtea-2.6pre21.tar.bz2 fcc167de17354efb6e52cb387eb3e7dbb0316b53 SOURCES/class-rewriter.tar.gz -0b15203f0e516b09783df9a06e5ee17183e3e54c SOURCES/openjdk-icedtea-2.5.4.tar.xz +8722f1b2887b45b8930a872710c62470e506d376 SOURCES/openjdk-icedtea-2.5.5.tar.xz fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz becc037bf0eb13b5f0ebcdd94b58ebfe6336b7a0 SOURCES/systemtap-tapset-2014-03-19.tar.xz diff --git a/SOURCES/RH1187252.java b/SOURCES/RH1187252.java deleted file mode 100644 index 79a5596..0000000 --- a/SOURCES/RH1187252.java +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.Properties; - -public class RH1187252 -{ - public static void main(String[] args) - { - Properties props = System.getProperties(); - String[] archProps = {"java.library.path", - "sun.boot.library.path", - "os.arch"}; - for (String prop : archProps) - System.out.printf("%s = %s\n", prop, - props.getProperty(prop)); - } -} diff --git a/SOURCES/rh1191652-hotspot-aarch64.patch b/SOURCES/rh1191652-hotspot-aarch64.patch deleted file mode 100644 index 91e13ed..0000000 --- a/SOURCES/rh1191652-hotspot-aarch64.patch +++ /dev/null @@ -1,41 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1424102734 0 -# Mon Feb 16 16:05:34 2015 +0000 -# Node ID 4fdaf786d977aa77afdb68b8829579d31069e39c -# Parent 01a0011cc101f3308c5876db8282c0fc5e3ba2e6 -PR2236: ppc64le should report its os.arch as ppc64le so tools can detect it -Summary: Use ppc64le as the arch directory on that platform and report it in os.arch - -diff -r 01a0011cc101 -r 4fdaf786d977 make/defs.make ---- openjdk/hotspot/make/defs.make Mon Feb 16 13:18:10 2015 +0000 -+++ openjdk/hotspot/make/defs.make Mon Feb 16 16:05:34 2015 +0000 -@@ -316,6 +316,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 aarch64 ia64 ppc64 zero - endif - -diff -r 01a0011cc101 -r 4fdaf786d977 src/os/linux/vm/os_linux.cpp ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Mon Feb 16 13:18:10 2015 +0000 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Mon Feb 16 16:05:34 2015 +0000 -@@ -305,7 +305,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/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec index 1d78f1b..cfcbd71 100644 --- a/SPECS/java-1.7.0-openjdk.spec +++ b/SPECS/java-1.7.0-openjdk.spec @@ -5,11 +5,11 @@ # conflicting) files in the -debuginfo package %undefine _missing_build_ids_terminate_build -%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 @@ -128,10 +128,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} @@ -170,7 +170,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: %{icedtea_version}.7%{?dist} +Release: %{icedtea_version}.1%{?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 @@ -199,10 +199,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 @@ -245,9 +245,6 @@ Source12: TestCryptoLevel.java Source13: java-abrt-luncher -# Print library settings from JDK -Source14: RH1187252.java - # RPM/distribution specific patches # Allow TCK to pass with access bridge wired in @@ -294,9 +291,9 @@ Patch400: rh1022017.patch 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: rh1191652-hotspot-aarch64.patch # End of tmp patches @@ -503,6 +500,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} @@ -574,11 +577,9 @@ tar xzf %{SOURCE9} %patch200 %patch403 -# HotSpot ppc64le patch is different depending -# on whether we are using 2.5 or 2.6 HotSpot. -%ifarch %{aarch64} -%patch406 -%else +# HotSpot ppc64le patch is applied upstream +# on AArch64/2.6.x HotSpot. +%ifnarch %{aarch64} %patch404 %endif %patch405 @@ -807,10 +808,6 @@ rm -f %{buildoutputdir}/lib/fontconfig*.bfc $JAVA_HOME/bin/javac -d . %{SOURCE12} $JAVA_HOME/bin/java TestCryptoLevel -# Print library paths from JDK -$JAVA_HOME/bin/javac -d . %{SOURCE14} -$JAVA_HOME/bin/java RH1187252 - sh %{SOURCE11} ${JAVA_HOME} %install @@ -1560,6 +1557,17 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Fri Apr 10 2015 Jiri Vanek - 1:1.7.0.75-2.5.5.1 +- repacked sources +- Resolves: rhbz#1209072 + +* Tue Apr 07 2015 Andrew Hughes - 1:1.7.0.75-2.5.5.0 +- Bump to 2.5.5 using OpenJDK 7u79 b14. +- Update OpenJDK tarball creation comments +- Remove test case for RH1191652 now fix has been verified. +- Drop AArch64 version of RH1191652 HotSpot patch as included upstream. +- Resolves: rhbz#1209072 + * Wed Mar 04 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.7 - ppc64le now has pulseaudio - Resolves: rhbz#1191652