java-bootstrapping: Do not rely on hardcoded paths

Various paths to files are hardcoded in either helper scripts or the
resulting binaries (like path to Java class libraries). While this works
well when using the files on the build machine, things start breaking
down when the sstate gets shared between multiple workers in CI, as
the paths between workers can differ.

Instead of using these hardcoded paths, form the paths at runtime and pass them as parameters when required.

Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>

2 files changed, 15 insertions, 2 deletions

diff --git a/recipes-core/ecj/ecj-bootstrap-native.bb b/recipes-core/ecj/ecj-bootstrap-native.bb
index e159c9d..276a8f0 100644
--- a/recipes-core/ecj/ecj-bootstrap-native.bb
+++ b/recipes-core/ecj/ecj-bootstrap-native.bb
@@ -27,7 +27,13 @@ inherit native
 do_compile() {
   # Create the start script
   echo "#!/bin/sh" > ecj-bootstrap
-  echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-bootstrap
+
+  # get absolute path to parent directory, and use that as base path for the jar
+  echo "SH_DIR=\`dirname "\$0"\`" >> ecj-bootstrap
+  echo "CURRENT_DIR=\`cd "\${SH_DIR}" && pwd\`" >> ecj-bootstrap
+  echo "PARENT_DIR=\`dirname \${CURRENT_DIR}\`" >> ecj-bootstrap
+
+  echo "ECJ_JAR=\${PARENT_DIR}/share/java/${JAR}" >> ecj-bootstrap
   echo "RUNTIME=java" >> ecj-bootstrap
   cat ecj.in >> ecj-bootstrap
 }
diff --git a/recipes-core/ecj/ecj-initial-native.bb b/recipes-core/ecj/ecj-initial-native.bb
index ed334ed..1792390 100644
--- a/recipes-core/ecj/ecj-initial-native.bb
+++ b/recipes-core/ecj/ecj-initial-native.bb
@@ -21,11 +21,18 @@ JAR = "ecj-bootstrap.jar"
 do_compile() {
   # Create the start script
   echo "#!/bin/sh" > ecj-initial
-  echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial
+
+  # get absolute path to parent directory, and use that as base path for the jar
+  echo "SH_DIR=\`dirname "\$0"\`" >> ecj-initial
+  echo "CURRENT_DIR=\`cd "\${SH_DIR}" && pwd\`" >> ecj-initial
+  echo "PARENT_DIR=\`dirname \${CURRENT_DIR}\`" >> ecj-initial
+
+  echo "ECJ_JAR=\${PARENT_DIR}/share/java/${JAR}" >> ecj-initial
   echo "RUNTIME=java-initial" >> ecj-initial
   cat ecj-initial.in >> ecj-initial
 }
 
+
 do_install() {
   install -d ${D}${bindir}
   install -m 755 ${S}/ecj-initial ${D}${bindir}