diff --git a/scripts/build.sh b/scripts/build.sh index 7b96af4..e783dba 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -27,7 +27,6 @@ fi # - Force softfloat runtime: -D__SOFTFP__ # Fix the "internal" string: --with-version-string="" # Use correct JNI path: --with-jni-libpath=:... -# Use AdoptOpenJDK CA certs: --with-cacerts-file= # Use correct debug level --with-debug-level= # Help to find freetype: --with-freetype-lib=/usr/lib/arm-linux-gnueabi # --with-freetype-include=/usr/include @@ -58,7 +57,6 @@ if [ "$JDKPLATFORM" == "ev3" ]; then --with-version-string="$JAVA_VERSION" \ $JNI_PATH_FLAGS \ $VENDOR_FLAGS \ - --with-cacerts-file="$CACERTFILE" \ --with-debug-level=$HOTSPOT_DEBUG \ --with-native-debug-symbols=internal \ --with-stdc++lib=dynamic \ diff --git a/scripts/config.sh b/scripts/config.sh index 07e0c70..8ce016b 100644 --- a/scripts/config.sh +++ b/scripts/config.sh @@ -6,12 +6,6 @@ SCRIPTDIR="$( cd "$(dirname "$0")" ; pwd -P )" BUILDDIR="/build" # jdk repository directory JDKDIR="$BUILDDIR/jdk" -# openjdk-build repo dir -ABLDDIR="$BUILDDIR/openjdk-build" -# openjdk-build repo -ABLDREPO="https://github.com/AdoptOpenJDK/openjdk-build.git" -# cacertfile -CACERTFILE="$ABLDDIR/security/cacerts" # hg tarball JAVA_TMP="$BUILDDIR/jdk_tmp" TARBALL_MAX_DOWNLOADS=10 diff --git a/scripts/fetch.sh b/scripts/fetch.sh index 2ca54e0..37c7b6b 100644 --- a/scripts/fetch.sh +++ b/scripts/fetch.sh @@ -157,12 +157,3 @@ if [ ! -d "$JDKDIR" ]; then else echo "[FETCH] Directory for JDK repository exists, assuming everything has been done already." 2>&1 fi - - -if [ -d "$ABLDDIR" ]; then - rm -rf "$ABLDDIR" -fi - -# clone the root project -echo "[FETCH] Cloning openjdk-build repo" -git clone --depth 1 "$ABLDREPO" "$ABLDDIR"