tweak location of binary bazel

Move binary bazel from ${S} to ${WORKDIR}/bazel Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Wind-River · Aug 23, 2019 · acfb6c0 · acfb6c0
1 parent 806fb81
commit acfb6c0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/classes/bazel.bbclass b/classes/bazel.bbclass
@@ -3,19 +3,23 @@ DEPENDS += "bazel-native \
           "
 DEPENDS_append_class-target = " python3"
 
-BAZEL_OUTPUTBASE_DIR ?= "${WORKDIR}/bazel/output_base"
-export BAZEL_ARGS="--output_user_root=${WORKDIR}/bazel/user_root \
+BAZEL_DIR ?= "${WORKDIR}/bazel"
+BAZEL_OUTPUTBASE_DIR ?= "${BAZEL_DIR}/output_base"
+export BAZEL_ARGS="--output_user_root=${BAZEL_DIR}/user_root \
                    --output_base=${BAZEL_OUTPUTBASE_DIR} \
                    --bazelrc=${S}/bazelrc \
                   "
 
 export JAVA_HOME="${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native"
 
+BAZEL ?= "${BAZEL_DIR}/bazel"
+
 do_prepare_recipe_sysroot[postfuncs] += "do_install_bazel"
 do_install_bazel() {
-    install -m 0755 ${STAGING_BINDIR_NATIVE}/bazel ${S}
-    create_cmdline_wrapper ${S}/bazel \$BAZEL_ARGS
-    zip -A ${S}/bazel.real
+    mkdir -p ${BAZEL_DIR}
+    install -m 0755 ${STAGING_BINDIR_NATIVE}/bazel ${BAZEL_DIR}
+    create_cmdline_wrapper ${BAZEL} \$BAZEL_ARGS
+    zip -A ${BAZEL}.real
 }
 
 def bazel_get_flags(d):

diff --git a/...s-framework/tensorflow/files/0001-use-local-bazel-to-workaround-bazel-paralle-issue.patch b/...s-framework/tensorflow/files/0001-use-local-bazel-to-workaround-bazel-paralle-issue.patch
@@ -19,7 +19,7 @@ index 4f8cae2..2121a90 100644
      sys.exit(0)
    curr_version = run_shell(
 -      ['bazel', '--batch', '--bazelrc=/dev/null', 'version'])
-+      ['./bazel', '--batch', '--bazelrc=/dev/null', 'version'])
++      ['../bazel/bazel', '--batch', '--bazelrc=/dev/null', 'version'])
 
    for line in curr_version.split('\n'):
      if 'Build label: ' in line:

diff --git a/recipes-framework/tensorflow/tensorboard_1.12.2.bb b/recipes-framework/tensorflow/tensorboard_1.12.2.bb
@@ -45,15 +45,15 @@ do_configure_append () {
 do_compile () {
     unset CC
     DESTDIR=${WORKDIR}/python-tensorboard \
-     ${S}/bazel run \
+     ${BAZEL} run \
         --cpu=armeabi \
         --subcommands --explain=${T}/explain.log \
         --verbose_explanations --verbose_failures \
         --crosstool_top=@local_config_yocto_compiler//:toolchain \
         --verbose_failures \
         //tensorboard/pip_package:build_pip_package
 
-    ${S}/bazel shutdown
+    ${BAZEL} shutdown
 }
 
 do_install () {

diff --git a/recipes-framework/tensorflow/tensorflow-estimator_1.13.bb b/recipes-framework/tensorflow/tensorflow-estimator_1.13.bb
@@ -25,14 +25,14 @@ DEPENDS += " \
 do_compile () {
     unset CC
     export TMPDIR="${WORKDIR}"
-    ${S}/bazel build \
+    ${BAZEL} build \
         --subcommands --explain=${T}/explain.log \
         --verbose_explanations --verbose_failures \
         --verbose_failures \
         --python_path="${PYTHON}" \
         //tensorflow_estimator/tools/pip_package:build_pip_package
 
-    ${S}/bazel shutdown
+    ${BAZEL} shutdown
 
     PYTHON_BIN_PATH="${PYTHON}" \
     ${S}/bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package \

diff --git a/recipes-framework/tensorflow/tensorflow-native_1.13.0.bb b/recipes-framework/tensorflow/tensorflow-native_1.13.0.bb
@@ -39,14 +39,14 @@ do_configure_append () {
 
 do_compile () {
     unset CC
-    ${S}/bazel build \
+    ${BAZEL} build \
         -c opt \
         --subcommands --explain=${T}/explain.log \
         --verbose_explanations --verbose_failures \
         --verbose_failures \
         //tensorflow/tools/pip_package:build_pip_package
 
-    ${S}/bazel shutdown
+    ${BAZEL} shutdown
 }
 
 do_install() {

diff --git a/recipes-framework/tensorflow/tensorflow_1.13.0.bb b/recipes-framework/tensorflow/tensorflow_1.13.0.bb
@@ -113,7 +113,7 @@ TF_ARGS_EXTRA ??= ""
 TF_TARGET_EXTRA ??= ""
 do_compile () {
     unset CC
-    ${S}/bazel build \
+    ${BAZEL} build \
         ${TF_ARGS_EXTRA} \
         -c opt \
         --cpu=armeabi \
@@ -131,7 +131,7 @@ do_compile () {
         //tensorflow/lite/examples/label_image:label_image \
         ${TF_TARGET_EXTRA}
 
-    ${S}/bazel shutdown
+    ${BAZEL} shutdown
 }
 
 do_install() {