diff --git a/.gitignore b/.gitignore index bcdecd2..c6d9c14 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /jdk8u60-aarch64-jdk8u65-b17.tar.xz /aarch64-port-jdk8u60-aarch64-jdk8u65-b17.tar.xz /aarch64-jdk8u71-b15.tar.xz +/aarch64-port-jdk8u-aarch64-jdk8u72-b15.tar.xz diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh index 65782a8..8ed2b21 100755 --- a/generate_source_tarball.sh +++ b/generate_source_tarball.sh @@ -113,7 +113,7 @@ else fi; popd - +echo "Compresing remaining forest" if [ "X$COMPRESSION" = "Xxz" ] ; then tar --exclude-vcs -cJf ${FILE_NAME_ROOT}.tar.${COMPRESSION} openjdk else @@ -122,5 +122,6 @@ fi mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} .. popd +echo "Done, you may wont to remove freshly cloned repo..." diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index f4c08aa..6045372 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -148,8 +148,8 @@ %global origin openjdk # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global project aarch64-port -%global repo jdk8u60 -%global revision aarch64-jdk8u71-b15 +%global repo jdk8u +%global revision aarch64-jdk8u72-b15 # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%) %global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*}) # eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60 @@ -756,7 +756,7 @@ URL: http://openjdk.java.net/ # Source from upstream OpenJDK8 project. To regenerate, use # VERSION=aarch64-jdk8u71-b15 FILE_NAME_ROOT=${VERSION} # REPO_ROOT= generate_source_tarball.sh -Source0: %{revision}.tar.xz +Source0: %{project}-%{repo}-%{revision}.tar.xz # Custom README for -src subpackage Source2: README.src @@ -833,8 +833,6 @@ Patch605: soundFontPatch.patch # Fixes StackOverflowError on ARM32 bit Zero. See RHBZ#1206656 # 8087120: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms Patch403: rhbz1206656_fix_current_stack_pointer.patch -# S8146566, PR2428: OpenJDK build can't handle commas in LDFLAGS -Patch501: 8146566.patch # S8143855: Bad printf formatting in frame_zero.cpp Patch505: 8143855.patch @@ -1117,7 +1115,6 @@ sh %{SOURCE12} %patch602 %patch605 -%patch501 %patch502 %patch503 %patch504 @@ -1681,6 +1678,11 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Jan 27 2016 jvanek - 1:1.8.0.72-1.b15 +- updated to aarch64-jdk8u72-b15 (from aarch64-port/jdk8u) +- used aarch64-port-jdk8u-aarch64-jdk8u72-b15.tar.xz as new sources +- removed already upstreamed patch501 8146566.patch + * Wed Jan 20 2016 Jiri Vanek - 1:1.8.0.71-1.b15 - sync with rhel7 - security update to CPU 19.1.2016 to u71b15 diff --git a/sources b/sources index 8d42dc6..8131325 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz -07a99eb8771002d80862dbefd7629212 aarch64-jdk8u71-b15.tar.xz +a21f6b0591cd79ab10192c69cf85cd3f aarch64-port-jdk8u-aarch64-jdk8u72-b15.tar.xz diff --git a/update_package.sh b/update_package.sh index f42f40f..3282cd4 100755 --- a/update_package.sh +++ b/update_package.sh @@ -21,10 +21,10 @@ if [ "x$PROJECT_NAME" = "x" ] ; then PROJECT_NAME="aarch64-port" fi if [ "x$REPO_NAME" = "x" ] ; then - REPO_NAME="jdk8u60" + REPO_NAME="jdk8u" fi if [ "x$VERSION" = "x" ] ; then - VERSION="aarch64-jdk8u65-b17" + VERSION="aarch64-jdk8u72-b15" fi if [ "x$COMPRESSION" = "x" ] ; then