No it was not. The Zulu distribution of OpenJDK is of better quality in terms 
of maintenance (newer version, tested). But otherwise it is same thing and 
build from the same sources. 

Waldek 

Sent from my iPhone

> On Sep 12, 2018, at 06:05, Nadav Har'El <n...@scylladb.com> wrote:
> 
> 
>> On Sun, Sep 9, 2018 at 7:36 AM, Commit Bot <b...@cloudius-systems.com> wrote:
>> From: Waldemar Kozaczuk <jwkozac...@gmail.com>
>> Committer: Waldemar Kozaczuk <jwkozac...@gmail.com>
>> Branch: master
>> 
>> Deleted openjdk10-java-base and added openjdk10-zulu-java-base app
>> 
>> This patch deletes openjdk10-java-base app
> 
> I'm curious about the reason for this. Was OpenJDK discontinued or something?
>  
>> and instead adds
>> new openjdk10-zulu-java-base app that pulls Azul's ZULU distribution
>> of OpenJdk 10.
>> 
>> Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>
>> 
>> ---
>> diff --git a/openjdk10-java-base/Makefile b/openjdk10-java-base/Makefile
>> --- a/openjdk10-java-base/Makefile
>> +++ b/openjdk10-java-base/Makefile
>> @@ -1,33 +0,0 @@
>> -#
>> -# Copyright (C) 2013 Cloudius Systems, Ltd.
>> -#
>> -# This work is open source software, licensed under the terms of the
>> -# BSD license as described in the LICENSE file in the top-level directory.
>> -#
>> -
>> -.PHONY: module clean
>> -
>> -jvm_dir=install/usr/lib/jvm
>> -
>> -download_url=$(shell ./latest.sh)
>> -java_version=$(shell ./latest.sh version)
>> -java_fullname=openjdk-$(java_version)_linux-x64_bin.tar.gz
>> -
>> -jre_name=jdk-$(java_version)-java-base
>> -linked_jre_dir=usr/lib/jvm/$(jre_name)
>> -
>> -SRC = $(shell readlink -f ../..)
>> -
>> -module:
>> -       mkdir -p upstream
>> -       wget -c -O upstream/$(java_fullname) $(download_url)
>> -       cd upstream && tar xfz $(java_fullname)
>> -       rm -rf install && mkdir install
>> -       cd install && ../upstream/jdk-$(java_version)/bin/jlink 
>> --module-path ../upstream/jdk-$(java_version)/jmods --add-modules java.base 
>> --output $(linked_jre_dir) --strip-debug --compress=2
>> -       cd install && rm -rf $(linked_jre_dir)/bin
>> -       ln -sf $(jre_name) $(jvm_dir)/java
>> -       rm -rf $(jvm_dir)/java/lib/security/cacerts
>> -       ln -s /etc/pki/java/cacerts install/usr/lib/jvm/java/lib/security/
>> -
>> -clean:
>> -       rm -rf upstream install
>> diff --git a/openjdk10-java-base/latest.sh b/openjdk10-java-base/latest.sh
>> --- a/openjdk10-java-base/latest.sh
>> +++ b/openjdk10-java-base/latest.sh
>> @@ -1,9 +0,0 @@
>> -#!/bin/bash
>> -DOWNLOAD_URL=`wget -c -qO- http://jdk.java.net/10/ | grep -o 
>> "https://download.java.net/java/GA/jdk10.*linux-x64_bin.tar.gz\""; | grep -o 
>> "https.*tar.gz"`
>> -VERSION=`echo $DOWNLOAD_URL | grep -o "openjdk-.*linux" | grep -o 
>> '10\.[0-9]\+\.[0-9]\+'`
>> -
>> -if [ "$1" = "version" ]; then
>> -echo $VERSION
>> -else
>> -echo $DOWNLOAD_URL
>> -fi
>> diff --git a/openjdk10-zulu-java-base/Makefile 
>> b/openjdk10-zulu-java-base/Makefile
>> --- a/openjdk10-zulu-java-base/Makefile
>> +++ b/openjdk10-zulu-java-base/Makefile
>> @@ -0,0 +1,7 @@
>> +#
>> +# Copyright (C) 2013 Cloudius Systems, Ltd.
>> +#
>> +# This work is open source software, licensed under the terms of the
>> +# BSD license as described in the LICENSE file in the top-level directory.
>> +#
>> +include ../openjdk9-zulu-java-base/Makefile
>> diff --git a/openjdk10-zulu-java-base/latest.sh 
>> b/openjdk10-zulu-java-base/latest.sh
>> --- a/openjdk10-zulu-java-base/latest.sh
>> +++ b/openjdk10-zulu-java-base/latest.sh
>> @@ -0,0 +1,9 @@
>> +#!/bin/bash
>> +DOWNLOAD_URL=`wget -c -qO- http://www.azul.com/downloads/zulu/zulu-linux | 
>> grep -o '<a href=['"'"'"][^"'"'"']*['"'"'"]' | grep 
>> "jdk10.*linux.*64.tar.gz\"" | grep -o "https:.*tar.gz" | head -n 1`
>> +VERSION=`echo $DOWNLOAD_URL | grep -o "zulu10.*linux_x64"`
>> +
>> +if [ "$1" = "version" ]; then
>> +echo $VERSION
>> +else
>> +echo $DOWNLOAD_URL
>> +fi
>> diff --git a/openjdk10-zulu-java-base/module.py 
>> b/openjdk10-zulu-java-base/module.py
>> --- a/openjdk10-zulu-java-base/module.py
>> +++ b/openjdk10-zulu-java-base/module.py
>> @@ -12,7 +12,7 @@
>>  provides = ['java','java8','java9','java10']
>> 
>>  usr_files = FileMap()
>> -usr_files.add('${OSV_BASE}/apps/openjdk10-java-base/install').to('/').allow_symlink()
>> -usr_files.add('${OSV_BASE}/apps/openjdk10-java-base/install/usr/lib/jvm/java')
>>  \
>> +usr_files.add('${OSV_BASE}/apps/openjdk10-zulu-java-base/install').to('/').allow_symlink()
>> +usr_files.add('${OSV_BASE}/apps/openjdk10-zulu-java-base/install/usr/lib/jvm/java')
>>  \
>>      .to('/usr/lib/jvm/java') \
>>      .allow_symlink()
>> 
>> -- 
>> You received this message because you are subscribed to the Google Groups 
>> "OSv Development" group.
>> To unsubscribe from this group and stop receiving emails from it, send an 
>> email to osv-dev+unsubscr...@googlegroups.com.
>> For more options, visit https://groups.google.com/d/optout.
> 

-- 
You received this message because you are subscribed to the Google Groups "OSv 
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to