ansible: Portability fixes for reusing modules / Debian trixie

[lttng-ci.git] / scripts / lttng-tools / release.sh

diff --git a/scripts/lttng-tools/release.sh b/scripts/lttng-tools/release.sh
index de65b7a830210635e01ed85cd3d325d7274091c6..c6e6ce222cb2f4fd55e693fba143bf78ec634db5 100644 (file)
--- a/scripts/lttng-tools/release.sh
+++ b/scripts/lttng-tools/release.sh
@@ -89,7 +89,7 @@ export CPPFLAGS="-I$DEPS_INC"
 export LDFLAGS="-L$DEPS_LIB"
 
 export JAVA_HOME="/usr/lib/jvm/default-java"
-export CLASSPATH="$DEPS_JAVA/*:/usr/share/java/*"
+export CLASSPATH="$DEPS_JAVA/*:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar"
 
 SRCDIR="$WORKSPACE/src/lttng-tools"
 OUTDIR="$WORKSPACE/out"
@@ -128,8 +128,8 @@ PYTHON3=python3
 export PYTHON="$PYTHON3"
 export PYTHON_CONFIG="/usr/bin/$PYTHON3-config"
 
-P2_VERSION=$($PYTHON2 -c "import sys;print(sys.version[:3])")
-P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
+P2_VERSION=$($PYTHON2 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
+P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
 
 UST_PYTHON2="$WORKSPACE/deps/build/lib/python$P2_VERSION/site-packages"
 UST_PYTHON3="$WORKSPACE/deps/build/lib/python$P3_VERSION/site-packages"