[docker, scripts] Refactor Boot JDK out of container

Author: JakubVanek

README.md

@@ -31,19 +31,23 @@ sudo docker run --rm -it -v <path on host, where the sources should be stored>:/
 export JDKVER=9
 export JDKVER=10
 ```
-5. Now we can download the OpenJDK sources:
+5. Before we can start the build process, Boot JDK must be downloaded:
+```
+./prepare.sh
+```
+6. Now we can download the OpenJDK sources:
 ```
 ./fetch.sh
 ```
-6. The OpenJDK source tree should be ready. Now you can start the cross-build itself:
+7. The OpenJDK source tree should be ready. Now you can start the cross-build itself:
 ```
 ./build.sh
 ```
-7. Create the zipped images:
+8. Create the zipped images:
 ```
 ./zip.sh
 ```
-8. If the build was successful, JDK packages were created in `/build/jri-ev3.tar.gz`, `/build/jdk-ev3.tar.gz` and `/build/jmods.tar.gz`.
+9. If the build was successful, JDK packages were created in `/build/jri-ev3.tar.gz`, `/build/jdk-ev3.tar.gz` and `/build/jmods.tar.gz`.
 If you have mounted `/build`, you can access the files from the host.
 
 ## ~~JShell on the EV3~~

scripts/config.sh

@@ -8,18 +8,20 @@ BUILDDIR="/build"
 JDKDIR="/build/jdk"
 # output images directory
 IMAGEDIR="/build/jdk/build/linux-arm-normal-client-release/images"
-# boot jdk
-HOSTJDK="$SCRIPTDIR/jdk-10"
 
-
-# Version-specific configuration
+##
+## Version-specific configuration
+##
 
 # mercurial repository
 #JAVA_REPO="http://hg.openjdk.java.net/jdk-updates/jdkXu/"
+
 # patch to apply
 #PATCHVER="jdkX"
+
 # path to autogen.sh to regenerate the build system
 #AUTOGEN_PATH="./common/autoconf/autogen.sh"
+
 # hotspot variant to use
 #HOTSPOT_VARIANT=client
 # A comment from OpenJDK build system sums it up pretty well:
@@ -32,20 +34,37 @@ HOSTJDK="$SCRIPTDIR/jdk-10"
 # 'client' JVM starts fast enough and provides the best performance.
 # 'zero' JVM provides us with a fallback when ARMv5 sflt JIT stops working completely.
 
+## Boot JDK configs
+
+# Destination Boot JDK directory
+#HOSTJDK="$BUILDDIR/jdk-9.0.4"
+
+# Cached archive
+#HOSTJDK_FILE="$BUILDDIR/openjdk-9.0.4.tar.gz"
+
+# Download URL
+#HOSTJDK_URL="https://download.java.net/java/GA/jdk9/9.0.4/binaries/openjdk-9.0.4_linux-x64_bin.tar.gz"
+
 
 # OpenJDK 9
 if [ "$JDKVER" -eq "9" ]; then
   JAVA_REPO="http://hg.openjdk.java.net/jdk-updates/jdk9u/"
   PATCHVER="jdk9"
   AUTOGEN_PATH="./common/autoconf/autogen.sh"
   HOTSPOT_VARIANT=client
+  HOSTJDK="$BUILDDIR/jdk-9.0.4"
+  HOSTJDK_FILE="$BUILDDIR/openjdk-9.0.4.tar.gz"
+  HOSTJDK_URL="https://download.java.net/java/GA/jdk9/9.0.4/binaries/openjdk-9.0.4_linux-x64_bin.tar.gz"
 
 # OpenJDK 10
 elif [ "$JDKVER" -eq "10" ]; then
   JAVA_REPO="http://hg.openjdk.java.net/jdk-updates/jdk10u/"
   PATCHVER="jdk10"
   AUTOGEN_PATH="./make/autoconf/autogen.sh"
   HOTSPOT_VARIANT=client
+  HOSTJDK="$BUILDDIR/jdk-10"
+  HOSTJDK_FILE="$BUILDDIR/openjdk-10.tar.gz"
+  HOSTJDK_URL="https://download.java.net/java/GA/jdk10/10/binaries/openjdk-10_linux-x64_bin.tar.gz"
 
 # invalid or unset version
 else

scripts/prepare.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+cd "$(dirname ${BASH_SOURCE[0]})"
+source config.sh
+
+if [ ! -d "HOSTJDK" ]; then
+  if [ ! -e "$HOSTJDK_FILE" ]; then
+    wget "$HOSTJDK_URL" -O "$HOSTJDK_FILE"
+  fi
+  tar -xf "$HOSTJDK_FILE" -C "$(dirname "$HOSTJDK")"
+fi

system/Dockerfile

@@ -50,10 +50,6 @@ RUN dpkg --add-architecture armel && \
         mercurial \
         zlib1g-dev
 
-# download JDK 10
-RUN mkdir /opt/jdkcross
-RUN curl -SL https://download.java.net/java/GA/jdk10/10/binaries/openjdk-10_linux-x64_bin.tar.gz | tar -xzC /opt/jdkcross
-
 # prepare a nonroot user
 COPY compiler.sudoers /etc/sudoers.d/compiler
 RUN chmod 0440 /etc/sudoers.d/compiler && \