diff mbox series

[meta-tensorflow] recipes: WORKDIR -> UNPACKDIR transition

Message ID 20240528054609.4111089-1-changqing.li@windriver.com
State New
Headers show
Series [meta-tensorflow] recipes: WORKDIR -> UNPACKDIR transition | expand

Commit Message

Changqing Li May 28, 2024, 5:46 a.m. UTC 
From: Changqing Li <changqing.li@windriver.com>

* WORKDIR -> UNPACKDIR transition
* Switch away from S = WORKDIR

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 recipes-devtools/bazel/bazel-native_6.0.0.bb           | 3 ++-
 recipes-framework/tensorflow/tensorflow-lite_2.16.1.bb | 8 ++++----
 recipes-framework/tensorflow/tensorflow_2.16.1.bb      | 8 ++++----
 recipes-model/googlecodelabs/tensorflow-for-poets_2.bb | 2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/recipes-devtools/bazel/bazel-native_6.0.0.bb b/recipes-devtools/bazel/bazel-native_6.0.0.bb
index c930054..20f6c55 100644
--- a/recipes-devtools/bazel/bazel-native_6.0.0.bb
+++ b/recipes-devtools/bazel/bazel-native_6.0.0.bb
@@ -24,7 +24,8 @@  DEPENDS = "coreutils-native \
            openjdk-11-native \
           "
 
-S="${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit bazel-base
 
diff --git a/recipes-framework/tensorflow/tensorflow-lite_2.16.1.bb b/recipes-framework/tensorflow/tensorflow-lite_2.16.1.bb
index dd3ef0b..f6666e5 100644
--- a/recipes-framework/tensorflow/tensorflow-lite_2.16.1.bb
+++ b/recipes-framework/tensorflow/tensorflow-lite_2.16.1.bb
@@ -29,11 +29,11 @@  RDEPENDS:${PN} += " \
 
 do_configure:append () {
     mkdir -p ${S}/third_party/toolchains/yocto/
-    sed "s#%%CPU%%#${BAZEL_TARGET_CPU}#g" ${WORKDIR}/BUILD.in  > ${S}/third_party/toolchains/yocto/BUILD
+    sed "s#%%CPU%%#${BAZEL_TARGET_CPU}#g" ${UNPACKDIR}/BUILD.in  > ${S}/third_party/toolchains/yocto/BUILD
     chmod 644 ${S}/third_party/toolchains/yocto/BUILD
-    install -m 644 ${WORKDIR}/cc_config.bzl.tpl ${S}/third_party/toolchains/yocto/
-    install -m 644 ${WORKDIR}/yocto_compiler_configure.bzl ${S}/third_party/toolchains/yocto/
-    install -m 644 ${WORKDIR}/BUILD.yocto_compiler ${S}
+    install -m 644 ${UNPACKDIR}/cc_config.bzl.tpl ${S}/third_party/toolchains/yocto/
+    install -m 644 ${UNPACKDIR}/yocto_compiler_configure.bzl ${S}/third_party/toolchains/yocto/
+    install -m 644 ${UNPACKDIR}/BUILD.yocto_compiler ${S}
 
     CT_NAME=$(echo ${HOST_PREFIX} | rev | cut -c 2- | rev)
     SED_COMMAND="s#%%CT_NAME%%#${CT_NAME}#g"
diff --git a/recipes-framework/tensorflow/tensorflow_2.16.1.bb b/recipes-framework/tensorflow/tensorflow_2.16.1.bb
index 713c9c0..45e4a95 100644
--- a/recipes-framework/tensorflow/tensorflow_2.16.1.bb
+++ b/recipes-framework/tensorflow/tensorflow_2.16.1.bb
@@ -50,11 +50,11 @@  RDEPENDS:python3-tensorflow += " \
 
 do_configure:append () {
     mkdir -p ${S}/third_party/toolchains/yocto/
-    sed "s#%%CPU%%#${BAZEL_TARGET_CPU}#g" ${WORKDIR}/BUILD.in  > ${S}/third_party/toolchains/yocto/BUILD
+    sed "s#%%CPU%%#${BAZEL_TARGET_CPU}#g" ${UNPACKDIR}/BUILD.in  > ${S}/third_party/toolchains/yocto/BUILD
     chmod 644 ${S}/third_party/toolchains/yocto/BUILD
-    install -m 644 ${WORKDIR}/cc_config.bzl.tpl ${S}/third_party/toolchains/yocto/
-    install -m 644 ${WORKDIR}/yocto_compiler_configure.bzl ${S}/third_party/toolchains/yocto/
-    install -m 644 ${WORKDIR}/BUILD.yocto_compiler ${S}
+    install -m 644 ${UNPACKDIR}/cc_config.bzl.tpl ${S}/third_party/toolchains/yocto/
+    install -m 644 ${UNPACKDIR}/yocto_compiler_configure.bzl ${S}/third_party/toolchains/yocto/
+    install -m 644 ${UNPACKDIR}/BUILD.yocto_compiler ${S}
 
     CT_NAME=$(echo ${HOST_PREFIX} | rev | cut -c 2- | rev)
     SED_COMMAND="s#%%CT_NAME%%#${CT_NAME}#g"
diff --git a/recipes-model/googlecodelabs/tensorflow-for-poets_2.bb b/recipes-model/googlecodelabs/tensorflow-for-poets_2.bb
index b3eb21f..ae41bc8 100644
--- a/recipes-model/googlecodelabs/tensorflow-for-poets_2.bb
+++ b/recipes-model/googlecodelabs/tensorflow-for-poets_2.bb
@@ -88,7 +88,7 @@  do_install () {
     for file in retrain.py label_image.py __init__.py; do
         install -m 755 ${S}/scripts/$file ${D}/${PYTHON_SITEPACKAGES_DIR}/tensorflow_for_poets
     done
-    install -m 755 ${WORKDIR}/label_image_lite.py ${D}/${PYTHON_SITEPACKAGES_DIR}/tensorflow_for_poets
+    install -m 755 ${UNPACKDIR}/label_image_lite.py ${D}/${PYTHON_SITEPACKAGES_DIR}/tensorflow_for_poets
 
     install -d ${D}${datadir}/label_image
     install -m 644 ${S}/tf_files/*.pb ${D}${datadir}/label_image