Skip to content

Commit de225fd

Browse files
committed
[scripts] Update runtime to JDK 9.0.4
1 parent b3667d1 commit de225fd

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

build/Dockerfile.system

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ RUN dpkg --add-architecture armel && \
5050

5151
# download JDK 9
5252
RUN mkdir /opt/jdkcross
53-
RUN curl -SL http://download.java.net/java/GA/jdk9/9.0.1/binaries/openjdk-9.0.1_linux-x64_bin.tar.gz | tar -xzC /opt/jdkcross
53+
RUN curl -SL https://download.java.net/java/GA/jdk9/9.0.4/binaries/openjdk-9.0.4_linux-x64_bin.tar.gz | tar -xzC /opt/jdkcross
5454

5555
# prepare a nonroot user
5656
COPY compiler.sudoers /etc/sudoers.d/compiler

build/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bash ./common/autoconf/autogen.sh
2727
# BUILD_NM="gcc-nm"
2828

2929
# configure the build
30-
bash ./configure --with-boot-jdk="$SCRIPTDIR/jdk-9.0.1" \
30+
bash ./configure --with-boot-jdk="$SCRIPTDIR/jdk-9.0.4" \
3131
--openjdk-target=arm-linux-gnueabi \
3232
--with-abi-profile=arm-ev3 \
3333
--enable-headless-only \

build/zip.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ rm -rf ./jshell-support
1414
rm -f ./jdk-ev3
1515

1616
# build ev3 runtime image
17-
"$SCRIPTDIR/jdk-9.0.1/bin/jlink" \
17+
"$SCRIPTDIR/jdk-9.0.4/bin/jlink" \
1818
--module-path ./jmods/ \
1919
--endian little \
2020
--compress 0 \
@@ -25,8 +25,8 @@ rm -f ./jdk-ev3
2525
--output ./jre-ev3
2626

2727
# build microjdk
28-
"$SCRIPTDIR/jdk-9.0.1/bin/jlink" \
29-
--module-path "$SCRIPTDIR/jdk-9.0.1/jmods" \
28+
"$SCRIPTDIR/jdk-9.0.4/bin/jlink" \
29+
--module-path "$SCRIPTDIR/jdk-9.0.4/jmods" \
3030
--compress 2 \
3131
--strip-debug \
3232
--no-header-files \
@@ -41,8 +41,8 @@ ln -s ./jdk ./jdk-ev3
4141

4242
# JShell hack
4343
mkdir jshell-support
44-
"$SCRIPTDIR/jdk-9.0.1/bin/javac" -d ./jshell-support "$SCRIPTDIR/jshellhack/DumpPort.java"
45-
"$SCRIPTDIR/jdk-9.0.1/bin/jar" cf ./jshellhack.jar -C ./jshell-support jshellhack/DumpPort.class
44+
"$SCRIPTDIR/jdk-9.0.4/bin/javac" -d ./jshell-support "$SCRIPTDIR/jshellhack/DumpPort.java"
45+
"$SCRIPTDIR/jdk-9.0.4/bin/jar" cf ./jshellhack.jar -C ./jshell-support jshellhack/DumpPort.class
4646
cp ./jshellhack.jar ./jdk-pc/bin
4747
cp "$SCRIPTDIR/jshell-launch.sh" ./jdk-pc/bin
4848

0 commit comments

Comments
 (0)