aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Kroon <jacob.kroon@gmail.com>2019-12-12 13:00:54 +0100
committerRichard Leitner <richard.leitner@skidata.com>2019-12-27 11:46:17 +0100
commit1ff02d0de0da0e7922c395c9031b0ee4fa7448e0 (patch)
tree0cbb30b09ea603a6d5b36718fc41a464573b6b38
parent1f00d6d7f75c8085fcce1cedfcf8588541f2a073 (diff)
downloadmeta-java-1ff02d0de0da0e7922c395c9031b0ee4fa7448e0.tar.gz
meta-java-1ff02d0de0da0e7922c395c9031b0ee4fa7448e0.tar.bz2
meta-java-1ff02d0de0da0e7922c395c9031b0ee4fa7448e0.zip
cacao: Use python3 in java wrapper script
OE-Core has dropped python2 so switch to using python3. Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
-rw-r--r--recipes-core/cacao/cacao-2d6f6c14daf9/cacao-1.6.1-do-not-rely-on-absolute-paths.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-core/cacao/cacao-2d6f6c14daf9/cacao-1.6.1-do-not-rely-on-absolute-paths.patch b/recipes-core/cacao/cacao-2d6f6c14daf9/cacao-1.6.1-do-not-rely-on-absolute-paths.patch
index 2b046cf..665377b 100644
--- a/recipes-core/cacao/cacao-2d6f6c14daf9/cacao-1.6.1-do-not-rely-on-absolute-paths.patch
+++ b/recipes-core/cacao/cacao-2d6f6c14daf9/cacao-1.6.1-do-not-rely-on-absolute-paths.patch
@@ -27,8 +27,8 @@ index 0790f02..2118de7 100644
+
+# if this shell script is invoked through symlink, we get invalid paths. As getting the real path to this file is
+# very painful using only /bin/sh, python is used instead.
-+PYTHON_STR="import os; print os.path.dirname(os.path.realpath(os.readlink(\"${CURRENT_DIR}/java\"))) if os.path.islink(\"${CURRENT_DIR}/java\") else \"${CURRENT_DIR}\""
-+REAL_DIR=`python -c "${PYTHON_STR}"`
++PYTHON_STR="import os; print(os.path.dirname(os.path.realpath(os.readlink(\"${CURRENT_DIR}/java\"))) if os.path.islink(\"${CURRENT_DIR}/java\") else \"${CURRENT_DIR}\")"
++REAL_DIR=`python3 -c "${PYTHON_STR}"`
+
+PARENT_DIR=`dirname ${REAL_DIR}`
+