Add support for leJOS JDK bundling

Author: JakubVanek

scripts/Dockerfile

@@ -2,7 +2,8 @@ FROM ev3dev-lang-java:jdk-stretch
 
 # copy build patches & scripts
 COPY *.patch *.sh /opt/jdkcross/
-RUN chmod +x /opt/jdkcross/*.sh
+COPY lejos/       /opt/jdkcross/lejos/
+RUN chmod +x /opt/jdkcross/*.sh /opt/jdkcross/lejos/*.sh
 
 # this directory should be mounted
 VOLUME /build

scripts/config.sh

@@ -8,6 +8,8 @@ BUILDDIR="/build"
 JDKDIR="/build/jdk"
 # output images directory
 IMAGEDIR="/build/jdk/build/linux-arm-normal-client-release/images"
+# lejos temp directory
+LEJOSDIR="/build/lejos"
 
 ##
 ## Version-specific configuration
@@ -45,6 +47,8 @@ IMAGEDIR="/build/jdk/build/linux-arm-normal-client-release/images"
 # Download URL
 #HOSTJDK_URL="https://download.java.net/java/GA/jdk9/9.0.4/binaries/openjdk-9.0.4_linux-x64_bin.tar.gz"
 
+# leJOS JRI name
+#LEJOS_NAME=openjdk9-jri
 
 # OpenJDK 9
 if [ "$JDKVER" -eq "9" ]; then
@@ -55,6 +59,7 @@ if [ "$JDKVER" -eq "9" ]; then
   HOSTJDK="$BUILDDIR/jdk-9.0.4"
   HOSTJDK_FILE="$BUILDDIR/openjdk-9.0.4_linux-x64_bin.tar.gz"
   HOSTJDK_URL="https://download.java.net/java/GA/jdk9/9.0.4/binaries/openjdk-9.0.4_linux-x64_bin.tar.gz"
+  LEJOS_NAME=openjdk9-jri
 
 # OpenJDK 10
 elif [ "$JDKVER" -eq "10" ]; then
@@ -65,6 +70,7 @@ elif [ "$JDKVER" -eq "10" ]; then
   HOSTJDK="$BUILDDIR/jdk-10"
   HOSTJDK_FILE="$BUILDDIR/openjdk-10_linux-x64_bin.tar.gz"
   HOSTJDK_URL="https://download.java.net/java/GA/jdk10/10/binaries/openjdk-10_linux-x64_bin.tar.gz"
+  LEJOS_NAME=openjdk10-jri
 
 # invalid or unset version
 else

scripts/lejos/build.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+set -e
+
+cd "$(dirname ${BASH_SOURCE[0]})"
+source ../config.sh
+SCRIPTDIR="$SCRIPTDIR/.."
+
+# temp directory
+rm -rf "$LEJOSDIR"
+mkdir -p "$LEJOSDIR/deb" "$LEJOSDIR/root"
+
+echo "copy in JRI"
+cp -rf --preserve=links "$IMAGEDIR/jri-ev3" "$LEJOSDIR/jri"
+
+echo "download DEB packages"
+cd "$LEJOSDIR/deb"
+apt-get download `cat "$SCRIPTDIR/lejos/pkgs.txt"`
+
+echo "extract them"
+find . -type f -exec dpkg-deb -x {} ../root \;
+
+echo "remove unnecessary stuff"
+cd "$LEJOSDIR/root"
+rm -rf ./bin ./sbin ./etc ./usr/bin ./usr/sbin ./usr/share
+
+echo "move root to jri"
+mv "$LEJOSDIR/root" "$LEJOSDIR/jri/sysroot"
+
+echo "install dynamic linking wrappers"
+cd "$LEJOSDIR/jri/bin"
+
+for exe in `ls`; do
+  mv "$exe" "$exe.real"
+  ln -s "wrapper.sh" "$exe"
+done
+
+cp "$SCRIPTDIR/lejos/wrapper.sh" .
+
+echo "cleanup"
+rm -rf "$LEJOSDIR/deb"
+
+echo "create archive"
+cd "$LEJOSDIR"
+mv "jri" "$LEJOS_NAME"
+tar -cf - "$LEJOS_NAME" | pigz -9 > "$BUILDDIR/lejos-$LEJOS_NAME.tar.gz"

scripts/lejos/pkgs.txt

@@ -0,0 +1,30 @@
+gcc-6-base:armel
+libasound2-data
+libasound2:armel
+libavahi-client3:armel
+libavahi-common-data:armel
+libavahi-common3:armel
+libc-bin:armel
+libc6:armel
+libcomerr2:armel
+libcups2:armel
+libdbus-1-3:armel
+libffi6:armel
+libgcc1:armel
+libgmp10:armel
+libgnutls30:armel
+libgssapi-krb5-2:armel
+libhogweed4:armel
+libidn11:armel
+libk5crypto3:armel
+libkeyutils1:armel
+libkrb5-3:armel
+libkrb5support0:armel
+libnettle6:armel
+libp11-kit0:armel
+libpng16-16:armel
+libsystemd0:armel
+libtasn1-6:armel
+zlib1g:armel
+libexpat1:armel
+libfreetype6:armel

scripts/lejos/wrapper.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+DIR=`dirname "$0"`
+DIR=`eval "cd \"$DIR\" && pwd"`
+SYSDIR="$DIR/../sysroot"
+SYSDIR=`eval "cd \"$SYSDIR\" && pwd"`
+
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SYSDIR/lib:$SYSDIR/lib/arm-linux-gnueabi:$SYSDIR/usr/lib:$SYSDIR/usr/lib/arm-linux-gnueabi:$SYSDIR/usr/lib/arm-linux-gnueabi/gconv"
+exec "$SYSDIR/lib/ld-linux.so.3" "$DIR/$0.real" "$@"