Modified openjdk8-fedora ond openjdk9-ea-java-base to require new 'java-cmd' capability which can be provided during build process by adding either java-isolated or java-non-isolated to the list of modules (see examples below). The openjdk8-zulu-compactN apps on other hand implicitly include java-non-isolated module.
Added new openjdk8-ubuntu-profile3-with-java-beans app that is made of the compact3 profile plus java/beans and com/sun/beans classes which makes is 1-2 MB bigger. This new app provides smallest JRE that can be used by Java apps that rely on log4j 1.x, spring, etc. For example elasticsearch can run on this JRE. Removed duplications in module.py and usr.manifest files. Examples to build java apps: scripts/build image=java,java-example scripts/build image=java-non-isolated,openjdk8-fedora,java-example scripts/build image=openjdk8-zulu-compact1,java-example Signed-off-by: Waldemar Kozaczuk <[email protected]> --- .gitignore | 1 + elasticsearch/Makefile | 2 +- elasticsearch/module.py | 3 +- elasticsearch/usr.manifest | 1 + openjdk8-fedora-non-isolated/Makefile | 39 ---------------------- openjdk8-fedora-non-isolated/latest.sh | 9 ----- openjdk8-fedora-non-isolated/module.py | 28 ---------------- openjdk8-fedora-non-isolated/usr.manifest | 22 ------------ openjdk8-fedora/Makefile | 3 -- openjdk8-fedora/latest.sh | 2 +- openjdk8-fedora/module.py | 10 +----- openjdk8-fedora/usr.manifest | 22 ------------ openjdk8-zulu-compact-common/common.gmk | 10 ++---- openjdk8-zulu-compact-common/latest.sh | 2 +- openjdk8-zulu-compact1/Makefile | 1 + openjdk8-zulu-compact1/module.py | 9 +---- openjdk8-zulu-compact1/usr.manifest | 22 ------------ openjdk8-zulu-compact2/Makefile | 1 + openjdk8-zulu-compact2/module.py | 9 +---- openjdk8-zulu-compact2/usr.manifest | 22 ------------ .../Makefile | 2 ++ openjdk8-zulu-compact3-with-java-beans/latest.sh | 2 ++ .../module.py | 16 +++------ openjdk8-zulu-compact3/Makefile | 1 + openjdk8-zulu-compact3/module.py | 11 +----- openjdk8-zulu-compact3/usr.manifest | 22 ------------ openjdk9-ea-java-base/Makefile | 3 -- openjdk9-ea-java-base/module.py | 9 +---- openjdk9-ea-java-base/usr.manifest | 22 ------------ 29 files changed, 24 insertions(+), 282 deletions(-) create mode 100644 elasticsearch/usr.manifest delete mode 100644 openjdk8-fedora-non-isolated/Makefile delete mode 100755 openjdk8-fedora-non-isolated/latest.sh delete mode 100644 openjdk8-fedora-non-isolated/module.py delete mode 100644 openjdk8-fedora-non-isolated/usr.manifest delete mode 100644 openjdk8-fedora/usr.manifest delete mode 100644 openjdk8-zulu-compact1/usr.manifest delete mode 100644 openjdk8-zulu-compact2/usr.manifest copy {openjdk8-zulu-compact3 => openjdk8-zulu-compact3-with-java-beans}/Makefile (72%) create mode 100755 openjdk8-zulu-compact3-with-java-beans/latest.sh copy {openjdk8-zulu-compact2 => openjdk8-zulu-compact3-with-java-beans}/module.py (56%) delete mode 100644 openjdk8-zulu-compact3/usr.manifest delete mode 100644 openjdk9-ea-java-base/usr.manifest diff --git a/.gitignore b/.gitignore index c322622..48c9ab7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ upstream src ROOTFS +install diff --git a/elasticsearch/Makefile b/elasticsearch/Makefile index 6b04d38..7a0ebd3 100644 --- a/elasticsearch/Makefile +++ b/elasticsearch/Makefile @@ -1,4 +1,4 @@ -VERSION:=2.4.0 +VERSION:=2.4.2 NAME:=elasticsearch DIR:=$(NAME)-$(VERSION) TARBALL:=$(DIR).tar.gz diff --git a/elasticsearch/module.py b/elasticsearch/module.py index d9962ce..2505345 100644 --- a/elasticsearch/module.py +++ b/elasticsearch/module.py @@ -15,11 +15,10 @@ default = api.run( ' -XX:+HeapDumpOnOutOfMemoryError ' ' -XX:+DisableExplicitGC ' ' -Dfile.encoding=UTF-8 ' -' -Dosv.java.diagnostics ' ' -Djna.nosys=true ' ' -Des.insecure.allow.root=true ' ' -Des.path.home=/elasticsearch ' ' -Des.foreground=true ' -' -cp /elasticsearch/lib/elasticsearch-2.4.0.jar:/elasticsearch/lib/* ' +' -cp /elasticsearch/lib/elasticsearch-2.4.2.jar:/elasticsearch/lib/* ' ' org.elasticsearch.bootstrap.Elasticsearch ' ' start ') diff --git a/elasticsearch/usr.manifest b/elasticsearch/usr.manifest new file mode 100644 index 0000000..c31568e --- /dev/null +++ b/elasticsearch/usr.manifest @@ -0,0 +1 @@ +/elasticsearch/**: ${MODULE_DIR}/ROOTFS/elasticsearch/** diff --git a/openjdk8-fedora-non-isolated/Makefile b/openjdk8-fedora-non-isolated/Makefile deleted file mode 100644 index 5685e5b..0000000 --- a/openjdk8-fedora-non-isolated/Makefile +++ /dev/null @@ -1,39 +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 - -java_version=$(shell ./latest.sh java-1.8.0-openjdk-headless x86_64) -java_dir=http://mirrors.kernel.org/fedora/development/rawhide/Everything/x86_64/os/Packages/j/ -java_fullname=java-1.8.0-openjdk-headless-$(java_version).x86_64.rpm - -tzdata_version=$(shell ./latest.sh tzdata-java noarch) -tzdata_dir=http://mirrors.kernel.org/fedora/development/rawhide/Everything/x86_64/os/Packages/t/ -tzdata_fullname=tzdata-java-$(tzdata_version).noarch.rpm - -SRC = $(shell readlink -f ../..) - -module: - cd $(SRC)/java && mvn package -q -DskipTests=true - mkdir -p upstream - wget -c -O upstream/$(java_fullname) $(java_dir)$(java_fullname) - wget -c -O upstream/$(tzdata_fullname) $(tzdata_dir)$(tzdata_fullname) - rm -rf install - mkdir -p install - rpm2cpio upstream/$(java_fullname) | (cd install && cpio -id) - ln -sf java-1.8.0-openjdk-$(java_version).x86_64 $(jvm_dir)/java - rm -rf $(jvm_dir)/java/jre/lib/security/cacerts - rm -rf $(jvm_dir)/java/jre/lib/audio/* - rpm2cpio upstream/$(tzdata_fullname) | (cd install && cpio -id) - ln -s /etc/pki/java/cacerts install/usr/lib/jvm/java/jre/lib/security/ - -clean: - rm -rf upstream install - cd $(SRC)/java && mvn clean -q - -rm -f dependency-reduced-pom.xml diff --git a/openjdk8-fedora-non-isolated/latest.sh b/openjdk8-fedora-non-isolated/latest.sh deleted file mode 100755 index 36a1269..0000000 --- a/openjdk8-fedora-non-isolated/latest.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -package=$1 - -arch=$2 - -letter=${package:0:1} - -wget -qO- http://mirrors.kernel.org/fedora/development/rawhide/Everything/x86_64/os/Packages/$letter/ | grep "$package-[0-9].*$arch" | sed -e "s/<a href\=\"$package-\(.*\)\.$arch\.rpm\".*/\1/g" diff --git a/openjdk8-fedora-non-isolated/module.py b/openjdk8-fedora-non-isolated/module.py deleted file mode 100644 index 153db10..0000000 --- a/openjdk8-fedora-non-isolated/module.py +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (C) 2014 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. -# - -from osv.modules.filemap import FileMap -from osv.modules import api -import os, os.path - -provides = ['java'] - -non_isolated_jvm = True - -api.require('fonts') -api.require('ca-certificates') -api.require('libz') -api.require('josvsym') -api.require('httpserver-jolokia-plugin') -api.require('httpserver-jvm-plugin') - -usr_files = FileMap() -usr_files.add('${OSV_BASE}/apps/openjdk8-fedora/install').to('/').allow_symlink() -usr_files.add('${OSV_BASE}/apps/openjdk8-fedora/install/usr/lib/jvm/java') \ - .to('/usr/lib/jvm/java') \ - .allow_symlink() -usr_files.link('/usr/lib/jvm/jre').to('/usr/lib/jvm/java/jre') diff --git a/openjdk8-fedora-non-isolated/usr.manifest b/openjdk8-fedora-non-isolated/usr.manifest deleted file mode 100644 index bac42c4..0000000 --- a/openjdk8-fedora-non-isolated/usr.manifest +++ /dev/null @@ -1,22 +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. -# - -[manifest] -/usr/lib/libz.so.1: %(miscbase)s/usr/lib64/libz.so.1 -/usr/lib/&/libexpat.so.1: %(miscbase)s/usr/lib64/& -/usr/lib/&/libjpeg.so.62: %(miscbase)s/usr/lib64/& -/usr/lib/jni/balloon.so: java/jni/balloon.so -/usr/lib/jni/monitor.so: java/jni/monitor.so -/usr/lib/&/jni/elf-loader.so: java/& -/usr/lib/&/jni/networking.so: java/& -/usr/lib/&/jni/stty.so: java/& -/usr/lib/&/jni/tracepoint.so: java/& -/usr/lib/&/jni/power.so: java/& -/java.so: java/jvm/java_non_isolated.so -/java/runjava.jar: ${OSV_BASE}/java/runjava/target/runjava.jar -/java/cloudius.jar: ${OSV_BASE}/java/cloudius/target/cloudius.jar -/.java.policy: ${OSV_BASE}/modules/java/.java.policy diff --git a/openjdk8-fedora/Makefile b/openjdk8-fedora/Makefile index 5685e5b..42a89a7 100644 --- a/openjdk8-fedora/Makefile +++ b/openjdk8-fedora/Makefile @@ -20,7 +20,6 @@ tzdata_fullname=tzdata-java-$(tzdata_version).noarch.rpm SRC = $(shell readlink -f ../..) module: - cd $(SRC)/java && mvn package -q -DskipTests=true mkdir -p upstream wget -c -O upstream/$(java_fullname) $(java_dir)$(java_fullname) wget -c -O upstream/$(tzdata_fullname) $(tzdata_dir)$(tzdata_fullname) @@ -35,5 +34,3 @@ module: clean: rm -rf upstream install - cd $(SRC)/java && mvn clean -q - -rm -f dependency-reduced-pom.xml diff --git a/openjdk8-fedora/latest.sh b/openjdk8-fedora/latest.sh index 36a1269..4f554aa 100755 --- a/openjdk8-fedora/latest.sh +++ b/openjdk8-fedora/latest.sh @@ -6,4 +6,4 @@ arch=$2 letter=${package:0:1} -wget -qO- http://mirrors.kernel.org/fedora/development/rawhide/Everything/x86_64/os/Packages/$letter/ | grep "$package-[0-9].*$arch" | sed -e "s/<a href\=\"$package-\(.*\)\.$arch\.rpm\".*/\1/g" +wget -t 1 -qO- http://mirrors.kernel.org/fedora/development/rawhide/Everything/x86_64/os/Packages/$letter/ | grep "$package-[0-9].*$arch" | sed -e "s/<a href\=\"$package-\(.*\)\.$arch\.rpm\".*/\1/g" diff --git a/openjdk8-fedora/module.py b/openjdk8-fedora/module.py index 1ad644e..8adba47 100644 --- a/openjdk8-fedora/module.py +++ b/openjdk8-fedora/module.py @@ -4,20 +4,12 @@ # 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. # - from osv.modules.filemap import FileMap from osv.modules import api -import os, os.path +api.require('java-cmd') provides = ['java'] -api.require('fonts') -api.require('ca-certificates') -api.require('libz') -api.require('josvsym') -api.require('httpserver-jolokia-plugin') -api.require('httpserver-jvm-plugin') - usr_files = FileMap() usr_files.add('${OSV_BASE}/apps/openjdk8-fedora/install').to('/').allow_symlink() usr_files.add('${OSV_BASE}/apps/openjdk8-fedora/install/usr/lib/jvm/java') \ diff --git a/openjdk8-fedora/usr.manifest b/openjdk8-fedora/usr.manifest deleted file mode 100644 index 59ad8e1..0000000 --- a/openjdk8-fedora/usr.manifest +++ /dev/null @@ -1,22 +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. -# - -[manifest] -/usr/lib/libz.so.1: %(miscbase)s/usr/lib64/libz.so.1 -/usr/lib/&/libexpat.so.1: %(miscbase)s/usr/lib64/& -/usr/lib/&/libjpeg.so.62: %(miscbase)s/usr/lib64/& -/usr/lib/jni/balloon.so: java/jni/balloon.so -/usr/lib/jni/monitor.so: java/jni/monitor.so -/usr/lib/&/jni/elf-loader.so: java/& -/usr/lib/&/jni/networking.so: java/& -/usr/lib/&/jni/stty.so: java/& -/usr/lib/&/jni/tracepoint.so: java/& -/usr/lib/&/jni/power.so: java/& -/java.so: java/jvm/java.so -/java/runjava.jar: ${OSV_BASE}/java/runjava/target/runjava.jar -/java/cloudius.jar: ${OSV_BASE}/java/cloudius/target/cloudius.jar -/.java.policy: ${OSV_BASE}/modules/java/.java.policy diff --git a/openjdk8-zulu-compact-common/common.gmk b/openjdk8-zulu-compact-common/common.gmk index 16e6d7e..44901c0 100644 --- a/openjdk8-zulu-compact-common/common.gmk +++ b/openjdk8-zulu-compact-common/common.gmk @@ -13,14 +13,10 @@ java8_jdk_tarball_url = $(shell ./latest.sh) SRC = $(shell readlink -f ../..) -COMPACT_PROFILE_IMAGE_DIR=j2re-compact$(PROFILE_NUMBER)-image - module: - cd $(SRC)/java && mvn package -q -DskipTests=true - rm -rf upstream mkdir -p upstream - cd upstream && git clone https://github.com/wkozaczuk/openjdk8_compact_profiles_builder.git - cd upstream/openjdk8_compact_profiles_builder && ./build_compact_profile.sh $(java8_jdk_tarball_url) $(PROFILE_NUMBER) + cd upstream && (git -C openjdk8_compact_profiles_builder pull || git clone https://github.com/wkozaczuk/openjdk8_compact_profiles_builder.git openjdk8_compact_profiles_builder) + cd upstream/openjdk8_compact_profiles_builder && ./build_compact_profile.sh $(java8_jdk_tarball_url) $(PROFILE_NUMBER) $(ADD_JAVA_BEANS) rm -rf install mkdir -p install/usr/lib/jvm/$(COMPACT_PROFILE_IMAGE_DIR) mv upstream/openjdk8_compact_profiles_builder/work/build/linux-x86_64-normal-server-release/images/$(COMPACT_PROFILE_IMAGE_DIR) $(jvm_dir)/$(COMPACT_PROFILE_IMAGE_DIR)/jre @@ -32,5 +28,3 @@ module: clean: rm -rf upstream install - cd $(SRC)/java && mvn clean -q - -rm -f dependency-reduced-pom.xml diff --git a/openjdk8-zulu-compact-common/latest.sh b/openjdk8-zulu-compact-common/latest.sh index ad3726d..9fec74f 100755 --- a/openjdk8-zulu-compact-common/latest.sh +++ b/openjdk8-zulu-compact-common/latest.sh @@ -1,3 +1,3 @@ #!/bin/bash -wget -qO- http://www.azul.com/downloads/zulu/zulu-linux/ | grep "jdk8.*linux.*64.tar.gz" | grep -o "http:.*tar.gz" | head -1 +wget -qO- http://www.azul.com/downloads/zulu/zulu-linux | grep "jdk8.*linux.*64.tar.gz\"" | grep -o "http:.*tar.gz" | head -1 diff --git a/openjdk8-zulu-compact1/Makefile b/openjdk8-zulu-compact1/Makefile index 686c904..dcc22e4 100644 --- a/openjdk8-zulu-compact1/Makefile +++ b/openjdk8-zulu-compact1/Makefile @@ -6,6 +6,7 @@ # PROFILE_NUMBER=1 +COMPACT_PROFILE_IMAGE_DIR=j2re-compact$(PROFILE_NUMBER)-image include ../openjdk8-zulu-compact-common/common.gmk .PHONY: module clean diff --git a/openjdk8-zulu-compact1/module.py b/openjdk8-zulu-compact1/module.py index fc94a3d..c831d58 100644 --- a/openjdk8-zulu-compact1/module.py +++ b/openjdk8-zulu-compact1/module.py @@ -7,17 +7,10 @@ from osv.modules.filemap import FileMap from osv.modules import api -import os, os.path +api.require('java-non-isolated') provides = ['java'] -non_isolated_jvm = True - -api.require('fonts') -api.require('ca-certificates') -api.require('libz') -api.require('josvsym') - usr_files = FileMap() usr_files.add('${OSV_BASE}/apps/openjdk8-zulu-compact1/install').to('/').allow_symlink() usr_files.add('${OSV_BASE}/apps/openjdk8-zulu-compact1/install/usr/lib/jvm/java') \ diff --git a/openjdk8-zulu-compact1/usr.manifest b/openjdk8-zulu-compact1/usr.manifest deleted file mode 100644 index 92046f2..0000000 --- a/openjdk8-zulu-compact1/usr.manifest +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2016 Waldemar Kozaczuk -# -# 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. -# - -[manifest] -/usr/lib/libz.so.1: %(miscbase)s/usr/lib64/libz.so.1 -/usr/lib/&/libexpat.so.1: %(miscbase)s/usr/lib64/& -/usr/lib/&/libjpeg.so.62: %(miscbase)s/usr/lib64/& -/usr/lib/jni/balloon.so: java/jni/balloon.so -/usr/lib/jni/monitor.so: java/jni/monitor.so -/usr/lib/&/jni/elf-loader.so: java/& -/usr/lib/&/jni/networking.so: java/& -/usr/lib/&/jni/stty.so: java/& -/usr/lib/&/jni/tracepoint.so: java/& -/usr/lib/&/jni/power.so: java/& -/java.so: java/jvm/java_non_isolated.so -/java/cloudius.jar: ${OSV_BASE}/java/cloudius/target/cloudius.jar -/java/runjava.jar: ${OSV_BASE}/java/runjava/target/runjava.jar -/.java.policy: ${OSV_BASE}/modules/java/.java.policy diff --git a/openjdk8-zulu-compact2/Makefile b/openjdk8-zulu-compact2/Makefile index b78d850..570bfec 100644 --- a/openjdk8-zulu-compact2/Makefile +++ b/openjdk8-zulu-compact2/Makefile @@ -6,6 +6,7 @@ # PROFILE_NUMBER=2 +COMPACT_PROFILE_IMAGE_DIR=j2re-compact$(PROFILE_NUMBER)-image include ../openjdk8-zulu-compact-common/common.gmk .PHONY: module clean diff --git a/openjdk8-zulu-compact2/module.py b/openjdk8-zulu-compact2/module.py index 6642b11..14f9806 100644 --- a/openjdk8-zulu-compact2/module.py +++ b/openjdk8-zulu-compact2/module.py @@ -7,17 +7,10 @@ from osv.modules.filemap import FileMap from osv.modules import api -import os, os.path +api.require('java-non-isolated') provides = ['java'] -non_isolated_jvm = True - -api.require('fonts') -api.require('ca-certificates') -api.require('libz') -api.require('josvsym') - usr_files = FileMap() usr_files.add('${OSV_BASE}/apps/openjdk8-zulu-compact2/install').to('/').allow_symlink() usr_files.add('${OSV_BASE}/apps/openjdk8-zulu-compact2/install/usr/lib/jvm/java') \ diff --git a/openjdk8-zulu-compact2/usr.manifest b/openjdk8-zulu-compact2/usr.manifest deleted file mode 100644 index 92046f2..0000000 --- a/openjdk8-zulu-compact2/usr.manifest +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2016 Waldemar Kozaczuk -# -# 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. -# - -[manifest] -/usr/lib/libz.so.1: %(miscbase)s/usr/lib64/libz.so.1 -/usr/lib/&/libexpat.so.1: %(miscbase)s/usr/lib64/& -/usr/lib/&/libjpeg.so.62: %(miscbase)s/usr/lib64/& -/usr/lib/jni/balloon.so: java/jni/balloon.so -/usr/lib/jni/monitor.so: java/jni/monitor.so -/usr/lib/&/jni/elf-loader.so: java/& -/usr/lib/&/jni/networking.so: java/& -/usr/lib/&/jni/stty.so: java/& -/usr/lib/&/jni/tracepoint.so: java/& -/usr/lib/&/jni/power.so: java/& -/java.so: java/jvm/java_non_isolated.so -/java/cloudius.jar: ${OSV_BASE}/java/cloudius/target/cloudius.jar -/java/runjava.jar: ${OSV_BASE}/java/runjava/target/runjava.jar -/.java.policy: ${OSV_BASE}/modules/java/.java.policy diff --git a/openjdk8-zulu-compact3/Makefile b/openjdk8-zulu-compact3-with-java-beans/Makefile similarity index 72% copy from openjdk8-zulu-compact3/Makefile copy to openjdk8-zulu-compact3-with-java-beans/Makefile index be4c93d..f098ec6 100644 --- a/openjdk8-zulu-compact3/Makefile +++ b/openjdk8-zulu-compact3-with-java-beans/Makefile @@ -6,6 +6,8 @@ # PROFILE_NUMBER=3 +COMPACT_PROFILE_IMAGE_DIR=j2re-compact$(PROFILE_NUMBER)-with-java-beans-image +ADD_JAVA_BEANS=add_java_beans include ../openjdk8-zulu-compact-common/common.gmk .PHONY: module clean diff --git a/openjdk8-zulu-compact3-with-java-beans/latest.sh b/openjdk8-zulu-compact3-with-java-beans/latest.sh new file mode 100755 index 0000000..d0195a5 --- /dev/null +++ b/openjdk8-zulu-compact3-with-java-beans/latest.sh @@ -0,0 +1,2 @@ +#!/bin/bash +. ../openjdk8-zulu-compact-common/latest.sh diff --git a/openjdk8-zulu-compact2/module.py b/openjdk8-zulu-compact3-with-java-beans/module.py similarity index 56% copy from openjdk8-zulu-compact2/module.py copy to openjdk8-zulu-compact3-with-java-beans/module.py index 6642b11..cc4190a 100644 --- a/openjdk8-zulu-compact2/module.py +++ b/openjdk8-zulu-compact3-with-java-beans/module.py @@ -4,23 +4,15 @@ # 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. # - -from osv.modules.filemap import FileMap from osv.modules import api -import os, os.path +from osv.modules.filemap import FileMap +api.require('java-cmd') provides = ['java'] -non_isolated_jvm = True - -api.require('fonts') -api.require('ca-certificates') -api.require('libz') -api.require('josvsym') - usr_files = FileMap() -usr_files.add('${OSV_BASE}/apps/openjdk8-zulu-compact2/install').to('/').allow_symlink() -usr_files.add('${OSV_BASE}/apps/openjdk8-zulu-compact2/install/usr/lib/jvm/java') \ +usr_files.add('${OSV_BASE}/apps/openjdk8-zulu-compact3-with-java-beans/install').to('/').allow_symlink() +usr_files.add('${OSV_BASE}/apps/openjdk8-zulu-compact3-with-java-beans/install/usr/lib/jvm/java') \ .to('/usr/lib/jvm/java') \ .allow_symlink() usr_files.link('/usr/lib/jvm/jre').to('/usr/lib/jvm/java/jre') diff --git a/openjdk8-zulu-compact3/Makefile b/openjdk8-zulu-compact3/Makefile index be4c93d..bc04a69 100644 --- a/openjdk8-zulu-compact3/Makefile +++ b/openjdk8-zulu-compact3/Makefile @@ -6,6 +6,7 @@ # PROFILE_NUMBER=3 +COMPACT_PROFILE_IMAGE_DIR=j2re-compact$(PROFILE_NUMBER)-image include ../openjdk8-zulu-compact-common/common.gmk .PHONY: module clean diff --git a/openjdk8-zulu-compact3/module.py b/openjdk8-zulu-compact3/module.py index 78da3b9..dd3399d 100644 --- a/openjdk8-zulu-compact3/module.py +++ b/openjdk8-zulu-compact3/module.py @@ -7,19 +7,10 @@ from osv.modules.filemap import FileMap from osv.modules import api -import os, os.path +api.require('java-non-isolated') provides = ['java'] -non_isolated_jvm = True - -api.require('fonts') -api.require('ca-certificates') -api.require('libz') -api.require('josvsym') -api.require('httpserver-jolokia-plugin') -api.require('httpserver-jvm-plugin') - usr_files = FileMap() usr_files.add('${OSV_BASE}/apps/openjdk8-zulu-compact3/install').to('/').allow_symlink() usr_files.add('${OSV_BASE}/apps/openjdk8-zulu-compact3/install/usr/lib/jvm/java') \ diff --git a/openjdk8-zulu-compact3/usr.manifest b/openjdk8-zulu-compact3/usr.manifest deleted file mode 100644 index 92046f2..0000000 --- a/openjdk8-zulu-compact3/usr.manifest +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2016 Waldemar Kozaczuk -# -# 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. -# - -[manifest] -/usr/lib/libz.so.1: %(miscbase)s/usr/lib64/libz.so.1 -/usr/lib/&/libexpat.so.1: %(miscbase)s/usr/lib64/& -/usr/lib/&/libjpeg.so.62: %(miscbase)s/usr/lib64/& -/usr/lib/jni/balloon.so: java/jni/balloon.so -/usr/lib/jni/monitor.so: java/jni/monitor.so -/usr/lib/&/jni/elf-loader.so: java/& -/usr/lib/&/jni/networking.so: java/& -/usr/lib/&/jni/stty.so: java/& -/usr/lib/&/jni/tracepoint.so: java/& -/usr/lib/&/jni/power.so: java/& -/java.so: java/jvm/java_non_isolated.so -/java/cloudius.jar: ${OSV_BASE}/java/cloudius/target/cloudius.jar -/java/runjava.jar: ${OSV_BASE}/java/runjava/target/runjava.jar -/.java.policy: ${OSV_BASE}/modules/java/.java.policy diff --git a/openjdk9-ea-java-base/Makefile b/openjdk9-ea-java-base/Makefile index 441f5d2..37d241d 100644 --- a/openjdk9-ea-java-base/Makefile +++ b/openjdk9-ea-java-base/Makefile @@ -19,7 +19,6 @@ linked_jre_dir=usr/lib/jvm/$(jre_name) SRC = $(shell readlink -f ../..) module: - cd $(SRC)/java && mvn package -q -DskipTests=true mkdir -p upstream wget -c -O upstream/$(java_fullname) $(java_dir)$(java_fullname) rm -rf install @@ -34,5 +33,3 @@ module: clean: rm -rf upstream install - cd $(SRC)/java && mvn clean -q - -rm -f dependency-reduced-pom.xml diff --git a/openjdk9-ea-java-base/module.py b/openjdk9-ea-java-base/module.py index 6aa4373..1e0535e 100644 --- a/openjdk9-ea-java-base/module.py +++ b/openjdk9-ea-java-base/module.py @@ -7,17 +7,10 @@ from osv.modules.filemap import FileMap from osv.modules import api -import os, os.path +api.require('java-non-isolated') provides = ['java'] -non_isolated_jvm = True - -api.require('fonts') -api.require('ca-certificates') -api.require('libz') -api.require('josvsym') - usr_files = FileMap() usr_files.add('${OSV_BASE}/apps/openjdk9-ea-java-base/install').to('/').allow_symlink() usr_files.add('${OSV_BASE}/apps/openjdk9-ea-java-base/install/usr/lib/jvm/java') \ diff --git a/openjdk9-ea-java-base/usr.manifest b/openjdk9-ea-java-base/usr.manifest deleted file mode 100644 index bac42c4..0000000 --- a/openjdk9-ea-java-base/usr.manifest +++ /dev/null @@ -1,22 +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. -# - -[manifest] -/usr/lib/libz.so.1: %(miscbase)s/usr/lib64/libz.so.1 -/usr/lib/&/libexpat.so.1: %(miscbase)s/usr/lib64/& -/usr/lib/&/libjpeg.so.62: %(miscbase)s/usr/lib64/& -/usr/lib/jni/balloon.so: java/jni/balloon.so -/usr/lib/jni/monitor.so: java/jni/monitor.so -/usr/lib/&/jni/elf-loader.so: java/& -/usr/lib/&/jni/networking.so: java/& -/usr/lib/&/jni/stty.so: java/& -/usr/lib/&/jni/tracepoint.so: java/& -/usr/lib/&/jni/power.so: java/& -/java.so: java/jvm/java_non_isolated.so -/java/runjava.jar: ${OSV_BASE}/java/runjava/target/runjava.jar -/java/cloudius.jar: ${OSV_BASE}/java/cloudius/target/cloudius.jar -/.java.policy: ${OSV_BASE}/modules/java/.java.policy -- 2.7.4 -- 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 [email protected]. For more options, visit https://groups.google.com/d/optout.
