Hello community, here is the log from the commit of package java-9-openjdk for openSUSE:Factory checked in at 2017-08-28 15:14:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-9-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-9-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-9-openjdk" Mon Aug 28 15:14:34 2017 rev:8 rq:518545 version:9.0.0.0~181 Changes: -------- --- /work/SRC/openSUSE:Factory/java-9-openjdk/java-9-openjdk.changes 2017-08-01 09:25:28.534883212 +0200 +++ /work/SRC/openSUSE:Factory/.java-9-openjdk.new/java-9-openjdk.changes 2017-08-28 15:16:04.429927496 +0200 @@ -1,0 +2,16 @@ +Thu Aug 24 10:31:03 UTC 2017 - [email protected] + +- Package the conf directories in jre and jdk. Fixes bsc#1047842. + +------------------------------------------------------------------- +Wed Aug 23 09:54:09 UTC 2017 - [email protected] + +- Update to ustream tag jdk-9+181 +- Added patches: + * java-9-openjdk-linuxfilestore.patch + - Fix bsc#1032647, bsc#1052009 with btrfs subvolumes and + overlayfs + * 8073754-stack-overflow-9-build.patch + - Fix stack overflows in ppc build + +------------------------------------------------------------------- Old: ---- 06df1ce4b9b8.tar.bz2 24390da83c5e.tar.bz2 252475ccfd84.tar.bz2 3adfb547e3e4.tar.bz2 56ac1831ac59.tar.bz2 87243a3131f7.tar.bz2 b653b1b2ea88.tar.bz2 d2661aa42bff.tar.bz2 New: ---- 47f8d75b8765.tar.bz2 4a443796f6f5.tar.bz2 4f852cc3a1c9.tar.bz2 5ecbed313125.tar.bz2 8073754-stack-overflow-9-build.patch b656dea9398e.tar.bz2 ba71941ad9db.tar.bz2 bd66ea2fdde3.tar.bz2 ea18d767c9ec.tar.bz2 java-9-openjdk-linuxfilestore.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-9-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.l0GRA1/_old 2017-08-28 15:16:09.045278989 +0200 +++ /var/tmp/diff_new_pack.l0GRA1/_new 2017-08-28 15:16:09.053277865 +0200 @@ -32,17 +32,17 @@ %global minorver 0 %global securityver 0 %global patchver 0 -%global buildver 179 +%global buildver 181 %global root_project jdk9 %global root_repository jdk9 -%global root_revision 252475ccfd84 -%global corba_revision 24390da83c5e -%global hotspot_revision d2661aa42bff -%global jaxp_revision 87243a3131f7 -%global jaxws_revision 56ac1831ac59 -%global jdk_revision 06df1ce4b9b8 -%global langtools_revision b653b1b2ea88 -%global nashorn_revision 3adfb547e3e4 +%global root_revision b656dea9398e +%global corba_revision ba71941ad9db +%global hotspot_revision 4a443796f6f5 +%global jaxp_revision ea18d767c9ec +%global jaxws_revision 4f852cc3a1c9 +%global jdk_revision bd66ea2fdde3 +%global langtools_revision 5ecbed313125 +%global nashorn_revision 47f8d75b8765 %global icedtea_sound_version 1.0.1 # priority must be 6 digits in total %global priority 1905 @@ -186,6 +186,9 @@ Patch103: jdk9-gcc6.patch # Patch200: ppc_stack_overflow_fix.patch +Patch201: 8073754-stack-overflow-9-build.patch +# +Patch300: java-9-openjdk-linuxfilestore.patch BuildRequires: alsa-lib-devel BuildRequires: autoconf BuildRequires: automake @@ -293,8 +296,10 @@ Summary: OpenJDK Runtime Environment Group: Development/Languages/Java Requires: jpackage-utils +%if 0%{?suse_version} > 1320 # Require zoneinfo data in java8+ format provided by tzdata-java8 subpackage. -Requires: tzdata-java8 +Requires(post): tzdata-java8 +%endif # Post requires update-alternatives to install tool update-alternatives. Requires(post): update-alternatives # Postun requires update-alternatives to uninstall tool update-alternatives. @@ -478,6 +483,9 @@ %endif %patch200 -p1 +%patch201 -p1 + +%patch300 -p1 # Extract systemtap tapsets @@ -678,9 +686,9 @@ # Install main files. install -d -m 755 %{buildroot}%{_jvmdir}/%{sdkdir} - cp -a bin include lib %{buildroot}%{_jvmdir}/%{sdkdir} + cp -a bin include lib conf %{buildroot}%{_jvmdir}/%{sdkdir} install -d -m 755 %{buildroot}%{_jvmdir}/%{jredir} - cp -a jre/bin jre/lib %{buildroot}%{_jvmdir}/%{jredir} + cp -a jre/bin jre/lib jre/conf %{buildroot}%{_jvmdir}/%{jredir} # Install JCE policy symlinks. install -d -m 755 %{buildroot}%{_jvmprivdir}/%{archname}/jce/vanilla @@ -870,6 +878,15 @@ --install %{_jvmdir}/jre-%{javaver} \ jre_%{javaver} %{_jvmdir}/%{jrelnk} %{priority} +%if 0%{?suse_version} > 1320 +if [ -e %{_datadir}/javazi/tzdb.dat ]; then + if [ -e %{_jvmdir}/%{jredir}/lib/tzdb.dat ]; then + rm -f %{_jvmdir}/%{jredir}/lib/tzdb.dat + fi + ln -sf %{_datadir}/javazi/tzdb.dat %{_jvmdir}/%{jredir}/lib/tzdb.dat +fi +%endif + %postun headless if [ $1 -eq 0 ] then @@ -1001,6 +1018,15 @@ --install %{_jvmdir}/java-%{javaver} \ java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} %{priority} +%if 0%{?suse_version} > 1320 +if [ -e %{_datadir}/javazi/tzdb.dat ]; then + if [ -e %{_jvmdir}/%{sdkdir}/lib/tzdb.dat ]; then + rm -f %{_jvmdir}/%{sdkdir}/lib/tzdb.dat + fi + ln -sf %{_datadir}/javazi/tzdb.dat %{_jvmdir}/%{sdkdir}/lib/tzdb.dat +fi +%endif + %postun devel if [ $1 -eq 0 ] then @@ -1047,13 +1073,24 @@ %dir %{_jvmdir}/%{jredir}/lib/desktop %dir %{_jvmdir}/%{jredir}/lib/security +%dir %{_jvmdir}/%{jredir}/conf +%dir %{_jvmdir}/%{jredir}/conf/security +%dir %{_jvmdir}/%{jredir}/conf/security/policy +%dir %{_jvmdir}/%{jredir}/conf/security/policy/unlimited +%dir %{_jvmdir}/%{jredir}/conf/security/policy/limited +%dir %{_jvmdir}/%{jredir}/conf/management + %dir %{_jvmdir}/%{sdkdir} %{_jvmdir}/%{jrelnk} %{_jvmprivdir}/* %if 0%{?suse_version} <= 1130 %config(noreplace) %{cacerts} %endif +%if 0%{?suse_version} > 1320 +%ghost %{_jvmdir}/%{jredir}/lib/tzdb.dat +%endif %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklisted.certs +%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/nss.cfg %{_mandir}/man1/java-%{sdklnk}.1* %{_mandir}/man1/jjs-%{sdklnk}.1* %{_mandir}/man1/keytool-%{sdklnk}.1* @@ -1073,12 +1110,23 @@ %dir %{_jvmdir}/%{sdkdir}/bin %dir %{_jvmdir}/%{sdkdir}/include %dir %{_jvmdir}/%{sdkdir}/lib +%dir %{_jvmdir}/%{sdkdir}/conf +%dir %{_jvmdir}/%{sdkdir}/conf/security +%dir %{_jvmdir}/%{sdkdir}/conf/security/policy +%dir %{_jvmdir}/%{sdkdir}/conf/security/policy/unlimited +%dir %{_jvmdir}/%{sdkdir}/conf/security/policy/limited +%dir %{_jvmdir}/%{sdkdir}/conf/management + %if %{with_systemtap} %dir %{_jvmdir}/%{sdkdir}/tapset %endif %{_jvmdir}/%{sdkdir}/bin/* %{_jvmdir}/%{sdkdir}/include/* %{_jvmdir}/%{sdkdir}/lib/* +%if 0%{?suse_version} > 1320 +%ghost %{_jvmdir}/%{sdkdir}/lib/tzdb.dat +%endif +%{_jvmdir}/%{sdkdir}/conf/* %if %{with_systemtap} %{_jvmdir}/%{sdkdir}/tapset/*.stp ++++++ 06df1ce4b9b8.tar.bz2 -> 47f8d75b8765.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-9-openjdk/06df1ce4b9b8.tar.bz2 /work/SRC/openSUSE:Factory/.java-9-openjdk.new/47f8d75b8765.tar.bz2 differ: char 11, line 1 ++++++ d2661aa42bff.tar.bz2 -> 4a443796f6f5.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-9-openjdk/d2661aa42bff.tar.bz2 /work/SRC/openSUSE:Factory/.java-9-openjdk.new/4a443796f6f5.tar.bz2 differ: char 11, line 1 ++++++ 06df1ce4b9b8.tar.bz2 -> 4f852cc3a1c9.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-9-openjdk/06df1ce4b9b8.tar.bz2 /work/SRC/openSUSE:Factory/.java-9-openjdk.new/4f852cc3a1c9.tar.bz2 differ: char 11, line 1 ++++++ 06df1ce4b9b8.tar.bz2 -> 5ecbed313125.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-9-openjdk/06df1ce4b9b8.tar.bz2 /work/SRC/openSUSE:Factory/.java-9-openjdk.new/5ecbed313125.tar.bz2 differ: char 11, line 1 ++++++ 8073754-stack-overflow-9-build.patch ++++++ --- jdk9/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp +++ jdk9/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp @@ -32,11 +32,26 @@ // define_pd_global(bool, DontYieldALot, false); +#if defined(PPC64) || defined(PPC32) +// This needs to be >= 2240 as this is the minimal allowable stack +// for PPC/PPC64. We need such a large value in order to properly +// bootcycle-build on those platforms. +define_pd_global(intx, ThreadStackSize, 2240); +#else define_pd_global(intx, ThreadStackSize, 1536); +#endif #ifdef _LP64 +#ifdef PPC64 +define_pd_global(intx, VMThreadStackSize, 1600); +#else +define_pd_global(intx, VMThreadStackSize, 1024); +#endif // PPC64 +#else +#ifdef PPC32 define_pd_global(intx, VMThreadStackSize, 1024); #else define_pd_global(intx, VMThreadStackSize, 512); +#endif // PPC32 #endif // _LP64 define_pd_global(intx, CompilerThreadStackSize, 0); define_pd_global(size_t, JVMInvokeMethodSlack, 8192); --- jdk9/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp +++ jdk9/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp @@ -307,9 +307,15 @@ bool os::is_allocatable(size_t bytes) { /////////////////////////////////////////////////////////////////////////////// // thread stack +#if defined(PPC64) || defined(PPC32) +size_t os::Posix::_compiler_thread_min_stack_allowed = 2240 * K; +size_t os::Posix::_java_thread_min_stack_allowed = 2240 * K; +size_t os::Posix::_vm_internal_thread_min_stack_allowed = 2240 * K; +#else size_t os::Posix::_compiler_thread_min_stack_allowed = 64 * K; size_t os::Posix::_java_thread_min_stack_allowed = 64 * K; size_t os::Posix::_vm_internal_thread_min_stack_allowed = 64 * K; +#endif size_t os::Posix::default_stack_size(os::ThreadType thr_type) { #ifdef _LP64 --- jdk9/common/autoconf/boot-jdk.m4 +++ jdk9/common/autoconf/boot-jdk.m4 @@ -370,6 +370,10 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR JVM_HEAP_LIMIT_64="1600" STACK_SIZE_32=768 STACK_SIZE_64=1536 + case "$HOTSPOT_TARGET_CPU-$VAR_CPU" in zero-ppc*) + STACK_SIZE_32=2240 + STACK_SIZE_64=2240 + esac JVM_HEAP_LIMIT_GLOBAL=`expr $MEMORY_SIZE / 2` if test "$JVM_HEAP_LIMIT_GLOBAL" -lt "$JVM_HEAP_LIMIT_32"; then JVM_HEAP_LIMIT_32=$JVM_HEAP_LIMIT_GLOBAL ++++++ 06df1ce4b9b8.tar.bz2 -> b656dea9398e.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-9-openjdk/06df1ce4b9b8.tar.bz2 /work/SRC/openSUSE:Factory/.java-9-openjdk.new/b656dea9398e.tar.bz2 differ: char 11, line 1 ++++++ 06df1ce4b9b8.tar.bz2 -> ba71941ad9db.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-9-openjdk/06df1ce4b9b8.tar.bz2 /work/SRC/openSUSE:Factory/.java-9-openjdk.new/ba71941ad9db.tar.bz2 differ: char 11, line 1 ++++++ 06df1ce4b9b8.tar.bz2 -> bd66ea2fdde3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-9-openjdk/06df1ce4b9b8.tar.bz2 /work/SRC/openSUSE:Factory/.java-9-openjdk.new/bd66ea2fdde3.tar.bz2 differ: char 11, line 1 ++++++ 06df1ce4b9b8.tar.bz2 -> ea18d767c9ec.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-9-openjdk/06df1ce4b9b8.tar.bz2 /work/SRC/openSUSE:Factory/.java-9-openjdk.new/ea18d767c9ec.tar.bz2 differ: char 11, line 1 ++++++ java-9-openjdk-linuxfilestore.patch ++++++ --- jdk9/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java 2017-08-24 10:58:27.096028508 +0200 +++ jdk9/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java 2017-08-24 11:47:48.169595850 +0200 @@ -74,8 +74,16 @@ } catch (UnixException x) { x.rethrowAsIOException(parent); } - if (attrs.dev() != dev()) - break; + if (attrs.dev() != dev()) { + + // step 3: lookup mounted file systems (use /proc/mounts to ensure we + // find the file system even when not in /etc/mtab) + byte[] dir = path.asByteArray(); + for (UnixMountEntry entry: fs.getMountEntries("/proc/mounts")) { + if (Arrays.equals(dir, entry.dir())) + return entry; + } + } path = parent; parent = parent.getParent(); }
