diff --git a/src/.config b/src/.config index bd3a70c82..d86a2afd7 100644 --- a/src/.config +++ b/src/.config @@ -41,14 +41,6 @@ SYSLINUX_SOURCE_URL=http://kernel.org/pub/linux/utils/boot/syslinux/syslinux-6.0 # # ##################################################################### -# You need to manually download Oracle's JRE or JDK and set the property with -# the absolute path to the downloaded archive. Example: -# -# JAVA_ARCHIVE=/home/ivan/Downloads/jdk-8u131-linux-x64.tar.gz -# -#JAVA_ARCHIVE=/absolute/path/to/java.archive.tar.gz -#JAVA_ARCHIVE=/home/ivan/Downloads/jdk-9_linux-x64_bin.tar.gz - # You can find the latest kbd source bundles here: # # http://www.kbd-project.org/ diff --git a/src/minimal_overlay/bundles/java/.config b/src/minimal_overlay/bundles/java/.config new file mode 100644 index 000000000..3b3825af0 --- /dev/null +++ b/src/minimal_overlay/bundles/java/.config @@ -0,0 +1,11 @@ +# You can find the latest Oracle Java/JDK downloads here: +# +# http://www.oracle.com/technetwork/java/javase/downloads/index.html +# +# You need to manually download Oracle's JRE or JDK and set the property with +# the absolute path to the downloaded archive. Example: +# +# JAVA_ARCHIVE=/home/ivan/Downloads/jdk-8u131-linux-x64.tar.gz +# +#JAVA_ARCHIVE=/absolute/path/to/java.archive.tar.gz +JAVA_ARCHIVE=/home/ivan/Downloads/jdk-9.0.1_linux-x64_bin.tar.gz diff --git a/src/minimal_overlay/bundles/java/bundle.sh b/src/minimal_overlay/bundles/java/bundle.sh index 808e543e6..69cd7071b 100755 --- a/src/minimal_overlay/bundles/java/bundle.sh +++ b/src/minimal_overlay/bundles/java/bundle.sh @@ -14,14 +14,14 @@ # JAVA_ARCHIVE=/home/ivan/Downloads/jdk-8u102-linux-x64.tar.gz # # 3) Run this script. Note that the script will fail with error message if the -# 'JAVA_ARCHIVE' property is not set or if it points to invalid file. +# JAVA_ARCHIVE property is not set or if it points to invalid file. set -e . ../../common.sh # Read the 'JAVA_ARCHIVE' property from '.config' -JAVA_ARCHIVE="$(grep -i ^JAVA_ARCHIVE $MAIN_SRC_DIR/.config | cut -f2 -d'=')" +JAVA_ARCHIVE=`read_property JAVA_ARCHIVE` if [ "$JAVA_ARCHIVE" = "" ] ; then echo "ERROR: configuration property 'JAVA_ARCHIVE' is not set." diff --git a/src/minimal_overlay/bundles/java/bundle_deps b/src/minimal_overlay/bundles/java/bundle_deps new file mode 100644 index 000000000..61861db9e --- /dev/null +++ b/src/minimal_overlay/bundles/java/bundle_deps @@ -0,0 +1,2 @@ +glibc_full +zlib