Merge "ansible: Do not update jenkins node during ci-instances when not set"

[lttng-ci.git] / scripts / lttng-ust / build.sh

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index e39f29099e42082fef1ad1286a7502684c1de124..d9de73c4fe06599a3dd145fafc30ffe37f0723a3 100755 (executable)
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -114,9 +114,6 @@ PREFIX="/build"
 LIBDIR="lib"
 LIBDIR_ARCH="$LIBDIR"
 
-# Force the normal Python install layout without 'local' on Debian / Ubuntu
-export DEB_PYTHON_INSTALL_LAYOUT="deb"
-
 # RHEL and SLES both use lib64 but don't bother shipping a default autoconf
 # site config that matches this.
 if [[ ( -f /etc/redhat-release || -f /etc/products.d/SLES.prod || -f /etc/yocto-release ) ]]; then
@@ -189,7 +186,7 @@ freebsd*)
     export PYTHON="python3"
     export PYTHON_CONFIG="python3-config"
     export CLASSPATH='/usr/local/share/java/classes/*'
-    export JAVA_HOME='/usr/local/openjdk11'
+    export JAVA_HOME='/usr/local/openjdk17'
     ;;
 
 *)