Skip to content

[scripts] feat: use CA certificates from OpenJDK #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[scripts] feat: use CA certificates from OpenJDK #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ fi
# - Force softfloat runtime: -D__SOFTFP__
# Fix the "internal" string: --with-version-string="<version>"
# Use correct JNI path: --with-jni-libpath=<dir1>:<dir2>...
# Use AdoptOpenJDK CA certs: --with-cacerts-file=<path>
# Use correct debug level --with-debug-level=<level>
# Help to find freetype: --with-freetype-lib=/usr/lib/arm-linux-gnueabi
# --with-freetype-include=/usr/include
Expand Down Expand Up @@ -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 \
Expand Down
6 changes: 0 additions & 6 deletions scripts/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions scripts/fetch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"