diff options
7 files changed, 45 insertions, 9 deletions
diff --git a/classes/bazel.bbclass b/classes/bazel.bbclass index 3bda2c8..ad8d1b5 100644 --- a/classes/bazel.bbclass +++ b/classes/bazel.bbclass @@ -10,6 +10,13 @@ export BAZEL_ARGS="--output_user_root=${WORKDIR}/bazel/user_root \ export JAVA_HOME="${RECIPE_SYSROOT_NATIVE}/usr/lib/jvm/openjdk-8-native" +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 +} + def bazel_get_flags(d): flags = "" for i in d.getVar("CC").split()[1:]: diff --git a/recipes-devtools/bazel/bazel-native_0.21.0.bb b/recipes-devtools/bazel/bazel-native_0.21.0.bb index 122e507..debc30c 100644 --- a/recipes-devtools/bazel/bazel-native_0.21.0.bb +++ b/recipes-devtools/bazel/bazel-native_0.21.0.bb @@ -29,5 +29,4 @@ do_compile () { do_install () { install -d ${D}${bindir} install -m 0755 ${S}/output/bazel ${D}${bindir} - create_cmdline_wrapper ${D}/${bindir}/bazel \$BAZEL_ARGS } diff --git a/recipes-framework/tensorflow/files/0001-use-local-bazel-to-workaround-bazel-paralle-issue.patch b/recipes-framework/tensorflow/files/0001-use-local-bazel-to-workaround-bazel-paralle-issue.patch new file mode 100644 index 0000000..e1c3c9f --- /dev/null +++ b/recipes-framework/tensorflow/files/0001-use-local-bazel-to-workaround-bazel-paralle-issue.patch @@ -0,0 +1,28 @@ +From ecc7014fe42ac0bc7bc502f2671a8da09c90d6ea Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 13 Mar 2019 17:55:08 +0800 +Subject: [PATCH] use local bazel to workaround bazel paralle issue + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.py b/configure.py +index 4f8cae2..2121a90 100644 +--- a/configure.py ++++ b/configure.py +@@ -454,7 +454,7 @@ def check_bazel_version(min_version, max_version): + print('Cannot find bazel. Please install bazel.') + sys.exit(0) + curr_version = run_shell( +- ['bazel', '--batch', '--bazelrc=/dev/null', 'version']) ++ ['./bazel', '--batch', '--bazelrc=/dev/null', 'version']) + + for line in curr_version.split('\n'): + if 'Build label: ' in line: +-- +2.7.4 + diff --git a/recipes-framework/tensorflow/tensorboard_1.12.2.bb b/recipes-framework/tensorflow/tensorboard_1.12.2.bb index bb15b27..8bbea14 100644 --- a/recipes-framework/tensorflow/tensorboard_1.12.2.bb +++ b/recipes-framework/tensorflow/tensorboard_1.12.2.bb @@ -43,7 +43,7 @@ do_configure_append () { do_compile () { unset CC DESTDIR=${WORKDIR}/python-tensorboard \ - ${STAGING_BINDIR_NATIVE}/bazel run \ + ${S}/bazel run \ --cpu=armeabi \ --subcommands --explain=${T}/explain.log \ --verbose_explanations --verbose_failures \ @@ -51,7 +51,7 @@ do_compile () { --verbose_failures \ //tensorboard/pip_package:build_pip_package - ${STAGING_BINDIR_NATIVE}/bazel shutdown + ${S}/bazel shutdown } do_install () { diff --git a/recipes-framework/tensorflow/tensorflow-estimator_1.13.bb b/recipes-framework/tensorflow/tensorflow-estimator_1.13.bb index 5400888..5d37677 100644 --- 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}" - ${STAGING_BINDIR_NATIVE}/bazel build \ + ${S}/bazel build \ --subcommands --explain=${T}/explain.log \ --verbose_explanations --verbose_failures \ --verbose_failures \ --python_path="${PYTHON}" \ //tensorflow_estimator/tools/pip_package:build_pip_package - ${STAGING_BINDIR_NATIVE}/bazel shutdown + ${S}/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 index e747670..7be0890 100644 --- a/recipes-framework/tensorflow/tensorflow-native_1.13.0.bb +++ b/recipes-framework/tensorflow/tensorflow-native_1.13.0.bb @@ -6,6 +6,7 @@ DEPENDS = "bazel-native protobuf-native util-linux-native protobuf" SRCREV = "c8875cbb1341f6ca14dd0ec908f1dde7d67f7808" SRC_URI = "git://github.com/tensorflow/tensorflow.git;branch=r1.13 \ file://0001-SyntaxError-around-async-keyword-on-Python-3.7.patch \ + file://0001-use-local-bazel-to-workaround-bazel-paralle-issue.patch \ " S = "${WORKDIR}/git" @@ -37,14 +38,14 @@ do_configure_append () { do_compile () { unset CC - ${STAGING_BINDIR_NATIVE}/bazel build \ + ${S}/bazel build \ -c opt \ --subcommands --explain=${T}/explain.log \ --verbose_explanations --verbose_failures \ --verbose_failures \ //tensorflow/tools/pip_package:build_pip_package - ${STAGING_BINDIR_NATIVE}/bazel shutdown + ${S}/bazel shutdown } do_install() { diff --git a/recipes-framework/tensorflow/tensorflow_1.13.0.bb b/recipes-framework/tensorflow/tensorflow_1.13.0.bb index 2f890bd..b0302bf 100644 --- a/recipes-framework/tensorflow/tensorflow_1.13.0.bb +++ b/recipes-framework/tensorflow/tensorflow_1.13.0.bb @@ -12,6 +12,7 @@ SRC_URI = "git://github.com/tensorflow/tensorflow.git;branch=r1.13 \ file://0001-fix-build-tensorflow-lite-examples-label_image-label.patch \ file://0001-label_image-tweak-default-model-location.patch \ file://0001-label_image.lite-tweak-default-model-location.patch \ + file://0001-use-local-bazel-to-workaround-bazel-paralle-issue.patch \ file://BUILD \ file://BUILD.yocto_compiler \ file://CROSSTOOL.tpl \ @@ -105,7 +106,7 @@ ENDOF do_compile () { unset CC - ${STAGING_BINDIR_NATIVE}/bazel build \ + ${S}/bazel build \ --config=monolithic \ -c opt \ --cpu=armeabi \ @@ -121,7 +122,7 @@ do_compile () { tensorflow/examples/label_image/... \ //tensorflow/lite/examples/label_image:label_image \ - ${STAGING_BINDIR_NATIVE}/bazel shutdown + ${S}/bazel shutdown } do_install() { |