Skip to contentSkip to conversation

recipes: adapt to UNPACKDIR changes

PATCH In review [email protected] 2 participants 9 messages Jul 8, 2025 – Aug 6, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 recipes: adapt to UNPACKDIR changes

From: Martin Jansa <[email protected]>

Please see
https://git.yoctoproject.org/poky/commit/?id=4dd321f8b83afecd962393101b2a6861275b5265
for what changes are needed, and sed commands that can be used to make them en masse.

Based on migration guide from:
https://lists.yoctoproject.org/g/docs/message/7195

with added .bbappend as we have couple S assignments in .bbappends as well

sed -i "/^S = \"\${WORKDIR}\/git\"/d" find . -name \*.bb -o -name \*.inc -o -name \*.bbclass -o -name \*.bbappend && sed -i "s/^S = \"\${WORKDIR}\//S = \"\${UNPACKDIR}\//g" find . -name \*.bb -o -name \*.inc -o -name \*.bbclass -o -name \*.bbappend && sed -i -z -E 's/([ \t\f\v\r]*\n){3,}/\n\n/g' find . -name \*.bb -o -name \*.inc -o -name \*.bbappend

---
 recipes-devtools/openjdk/openjdk-11-native_11.0.15.bb       | 2 +-
 recipes-devtools/python/python3-mldtypes_0.5.1.bb           | 2 +-
 recipes-devtools/python/python3-opt-einsum_3.3.0.bb         | 2 +-
 recipes-framework/tensorflow/keras_2.19.0.bb                | 1 -
 recipes-framework/tensorflow/tensorflow-estimator_2.15.0.bb | 1 -
 recipes-framework/tensorflow/tensorflow.inc                 | 2 --
 6 files changed, 3 insertions(+), 7 deletions(-)
recipes-devtools/openjdk/openjdk-11-native_11.0.15.bb +1 -1
index e982af6..cec79b2 100644
@@ -9,7 +9,7 @@ SRC_URI = " \
     https://github.com/ojdkbuild/contrib_jdk11u-ci/releases/download/jdk-11.0.15%2B10/jdk-11.0.15-ojdkbuild-linux-x64.zip \
 "
 
-S = "${WORKDIR}/jdk-11.0.15-ojdkbuild-linux-x64"
+S = "${UNPACKDIR}/jdk-11.0.15-ojdkbuild-linux-x64"
 
 do_patch[noexec] = "1"
 do_configure[noexec] = "1"
recipes-devtools/python/python3-mldtypes_0.5.1.bb +1 -1
index 1755226..b3f8b98 100644
@@ -11,7 +11,7 @@ inherit pypi python_setuptools_build_meta
 SRCNAME ?= "ml_dtypes"
 PYPI_SRC_URI = "https://files.pythonhosted.org/packages/32/49/6e67c334872d2c114df3020e579f3718c333198f8312290e09ec0216703a/${SRCNAME}-${PV}.tar.gz"
 SRC_URI += "file://0001-fix-setuptools-missing.patch"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${UNPACKDIR}/${SRCNAME}-${PV}"
 
 DEPENDS = " \
     python3-pybind11-native \
recipes-devtools/python/python3-opt-einsum_3.3.0.bb +1 -1
index ce9d220..4aecbba 100644
@@ -14,6 +14,6 @@ PYPI_SRC_URI = "https://files.pythonhosted.org/packages/source/o/${PYPI_PACKAGE}
 SRC_URI += " \
     file://0001-Use-ConfigParser-instead-of-SafeConfigParser.patch \
 "
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${UNPACKDIR}/${SRCNAME}-${PV}"
 
 BBCLASSEXTEND = "native"
recipes-framework/tensorflow/keras_2.19.0.bb +0 -1
index 3030f04..f6bcb03 100644
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/keras-team/tf-keras.git;branch=r2.19;protocol=https
           "
 
 SRCREV = "a697e6a2238224a89e5cf53fb86fd4808b1b9133"
-S = "${WORKDIR}/git"
 
 inherit python3native bazel
 
recipes-framework/tensorflow/tensorflow-estimator_2.15.0.bb +0 -1
index 012ecc8..e9aee35 100644
@@ -7,7 +7,6 @@ SRC_URI = "git://github.com/tensorflow/estimator.git;branch=r2.15;protocol=https
            file://0001-customize-for-yocto.patch \
           "
 SRCREV = "b5f91f8e4113396f0a5f090d6a52d676271caf48"
-S = "${WORKDIR}/git"
 
 inherit python3native bazel
 
recipes-framework/tensorflow/tensorflow.inc +0 -2
index be1ed11..8287032 100644
@@ -27,8 +27,6 @@ SRC_URI = "git://github.com/tensorflow/tensorflow.git;branch=r2.19;protocol=http
     file://0001-do-not-patch-.so-files-for-linux.patch \
 "
 
-S = "${WORKDIR}/git"
-
 DEPENDS += " \
     python3 \
     python3-requests-native \
#1 lore raw

PATCH 2/3 bazel-native: adapt to UNPACKDIR changes - avoid WORKDIR/sources

From: Martin Jansa <[email protected]>

Please see
https://git.yoctoproject.org/poky/commit/?id=4dd321f8b83afecd962393101b2a6861275b5265
for what changes are needed, and sed commands that can be used to make them en masse.

---
 recipes-devtools/bazel/bazel-native_6.0.0.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
recipes-devtools/bazel/bazel-native_6.0.0.bb +2 -4
index 19b411b..ef9dfba 100644
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI[md5sum] = "f79f57d82795b591e95f9f7fa0f9a8da"
 SRC_URI[sha256sum] = "7bc0c5145c19a56d82a08fce6908c5e1a0e75e4fbfb3b6f12b4deae7f4b38cbc"
 
-SRC_URI = "https://github.com/bazelbuild/bazel/releases/download/${PV}/bazel-${PV}-dist.zip \
+# bazel-${PV}-dist.zip doesn't have top-level directory, use subdir
+SRC_URI = "https://github.com/bazelbuild/bazel/releases/download/${PV}/bazel-${PV}-dist.zip;subdir=${BP} \
            file://0001-HttpDownloader-save-download-tarball-to-distdir.patch \
            file://0001-fix-unzip-command-not-found.patch \
            file://0001-add-Yocto-native-sysroot-dir-to-the-default-Bazel-to.patch \
@@ -25,9 +26,6 @@ DEPENDS = "coreutils-native \
            openjdk-11-native \
           "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
-
 inherit bazel-base
 
 EXTRA_BAZEL_ARGS = " \
#2 lore raw

Re: [meta-tensorflow][PATCH 2/3] bazel-native: adapt to UNPACKDIR changes - avoid WORKDIR/sources

Hongxu Jia looks like you've created very similar commits for whinlatter compatibility recently.

Do you monitor this ML for meta-tensorflow changes?

Quoted 36 lines · On Tue, Jul 8, 2025 at 9:24 AM <[email protected]> wrote:

From: Martin Jansa <[email protected]>

Please see
https://git.yoctoproject.org/poky/commit/?id=4dd321f8b83afecd962393101b2a6861275b5265
for what changes are needed, and sed commands that can be used to make them en masse.

---
 recipes-devtools/bazel/bazel-native_6.0.0.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
recipes-devtools/bazel/bazel-native_6.0.0.bb +2 -4
index 19b411b..ef9dfba 100644
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI[md5sum] = "f79f57d82795b591e95f9f7fa0f9a8da"
 SRC_URI[sha256sum] = "7bc0c5145c19a56d82a08fce6908c5e1a0e75e4fbfb3b6f12b4deae7f4b38cbc"
 
-SRC_URI = "https://github.com/bazelbuild/bazel/releases/download/${PV}/bazel-${PV}-dist.zip \
+# bazel-${PV}-dist.zip doesn't have top-level directory, use subdir
+SRC_URI = "https://github.com/bazelbuild/bazel/releases/download/${PV}/bazel-${PV}-dist.zip;subdir=${BP} \
            file://0001-HttpDownloader-save-download-tarball-to-distdir.patch \
            file://0001-fix-unzip-command-not-found.patch \
            file://0001-add-Yocto-native-sysroot-dir-to-the-default-Bazel-to.patch \
@@ -25,9 +26,6 @@ DEPENDS = "coreutils-native \
            openjdk-11-native \
           "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
-
 inherit bazel-base
 
 EXTRA_BAZEL_ARGS = " \
#3 lore raw

Re: [meta-tensorflow][PATCH 2/3] bazel-native: adapt to UNPACKDIR changes - avoid WORKDIR/sources

Quoted 7 lines · Martin Jansa

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Hongxu Jia looks like you've created very similar commits for whinlatter compatibility recently.

Do you monitor this ML for meta-tensorflow changes?

Sorry for the missing, I will take care of it next time

//Hongxu

Quoted 36 lines · On Tue, Jul 8, 2025 at 9:24 AM <[email protected]> wrote:
Quoted 35 lines

From: Martin Jansa <[email protected]>

Please see
https://git.yoctoproject.org/poky/commit/?id=4dd321f8b83afecd962393101b2a6861275b5265
for what changes are needed, and sed commands that can be used to make them en masse.

---
  recipes-devtools/bazel/bazel-native_6.0.0.bb | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
recipes-devtools/bazel/bazel-native_6.0.0.bb +2 -4
index 19b411b..ef9dfba 100644
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
  SRC_URI[md5sum] = "f79f57d82795b591e95f9f7fa0f9a8da"
  SRC_URI[sha256sum] = "7bc0c5145c19a56d82a08fce6908c5e1a0e75e4fbfb3b6f12b4deae7f4b38cbc"
 
-SRC_URI = "https://github.com/bazelbuild/bazel/releases/download/${PV}/bazel-${PV}-dist.zip \
+# bazel-${PV}-dist.zip doesn't have top-level directory, use subdir
+SRC_URI = "https://github.com/bazelbuild/bazel/releases/download/${PV}/bazel-${PV}-dist.zip;subdir=${BP} \
             file://0001-HttpDownloader-save-download-tarball-to-distdir.patch \
             file://0001-fix-unzip-command-not-found.patch \
             file://0001-add-Yocto-native-sysroot-dir-to-the-default-Bazel-to.patch \
@@ -25,9 +26,6 @@ DEPENDS = "coreutils-native \
             openjdk-11-native \
            "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
-
  inherit bazel-base
 
  EXTRA_BAZEL_ARGS = " \
#4 lore raw

Re: [meta-tensorflow][PATCH 2/3] bazel-native: adapt to UNPACKDIR changes - avoid WORKDIR/sources

Quoted 11 lines · Hongxu Jia
Quoted 7 lines · Martin Jansa

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Hongxu Jia looks like you've created very similar commits for whinlatter compatibility recently.

Do you monitor this ML for meta-tensorflow changes?

Sorry for the missing, I will take care of it next time

OK, will try to remember to Cc you directly if I'm sending some meta-tensorflow patches in future.

Can you please check what happened with master branch? there was 27237386b61 classes/bazel.bbclass: remove PSEUDO_IGNORE_PATHS around 2 days ago and now it's gone, did you remove it and force-pushed master (please don't do that, pushing new revert commit instead would be appreciated) or did it disappear due to some syncing issues in infrastructure?

I have noticed because our CI is failing either to fetch 27237386b61 or trying to "upgrade" from 27237386b61 to previous eb5054ccf48 without any git log between them.

#5 lore raw

Re: [meta-tensorflow][PATCH 2/3] bazel-native: adapt to UNPACKDIR changes - avoid WORKDIR/sources

Quoted 23 lines · Martin Jansa

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Quoted 9 lines · Hongxu Jia
Quoted 7 lines · Martin Jansa

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Hongxu Jia looks like you've created very similar commits for whinlatter compatibility recently.

Do you monitor this ML for meta-tensorflow changes?

Sorry for the missing, I will take care of it next time

OK, will try to remember to Cc you directly if I'm sending some meta-tensorflow patches in future.

Can you please check what happened with master branch? there was 27237386b61 classes/bazel.bbclass: remove PSEUDO_IGNORE_PATHS around 2 days ago and now it's gone, did you remove it and force-pushed master (please don't do that, pushing new revert commit instead would be appreciated) or did it disappear due to some syncing issues in infrastructure?

Quoted 3 lines

I have noticed because our CI is failing either to fetch 27237386b61 or trying to "upgrade" from 27237386b61 to previous eb5054ccf48 without any git log between them.

Got [27237386b61 classes/bazel.bbclass: remove PSEUDO_IGNORE_PATHS] back, there is a web hook in github to sync with https://git.yoctoproject.org/meta-tensorflow

You could git pull to latest

//Hongxu

#6 lore raw

Re: [meta-tensorflow][PATCH 2/3] bazel-native: adapt to UNPACKDIR changes - avoid WORKDIR/sources

Hi,
can you check whinlatter branch? It's out of sync with master branch 27237386b61 classes/bazel.bbclass: remove PSEUDO_IGNORE_PATHS was now removed in whinlatter branch (as it was previously removed from master branch and then restored).

Fetching origin
From https://git.yoctoproject.org/meta-tensorflow

   2723738..38cfa43  master     -> origin/master
   024c8dd..5865dad  walnascar  -> origin/walnascar

+ 2723738...f1e0f9d whinlatter -> origin/whinlatter (forced update)

docker-lge @ ~/layers/meta-tensorflow $ git log --oneline 2723738..38cfa43 38cfa43 (origin/master, origin/HEAD, g/master, g/HEAD) tensorflow.inc:
fix compile fail with DEBUG_BUILD = "1" for cortexa53 docker-lge @ ~/layers/meta-tensorflow $ git log --oneline 024c8dd..5865dad 5865dad (origin/walnascar, g/walnascar) tensorflow.inc: fix compile fail with DEBUG_BUILD = "1" for cortexa53
docker-lge @ ~/layers/meta-tensorflow $ git log --oneline 2723738...f1e0f9d f1e0f9d (origin/whinlatter, g/whinlatter) tensorflow.inc: fix compile fail with DEBUG_BUILD = "1" for cortexa53
2723738 (HEAD -> jansa/master, contrib/jansa/master, master) classes/bazel.bbclass: remove PSEUDO_IGNORE_PATHS

docker-lge @ ~/layers/meta-tensorflow $ git log --oneline origin/master | head -n 3
38cfa43 tensorflow.inc: fix compile fail with DEBUG_BUILD = "1" for cortexa53 2723738 classes/bazel.bbclass: remove PSEUDO_IGNORE_PATHS
eb5054c layer.conf: Update to whinlatter release series

docker-lge @ ~/layers/meta-tensorflow $ git log --oneline origin/whinlatter | head -n 3
f1e0f9d tensorflow.inc: fix compile fail with DEBUG_BUILD = "1" for cortexa53 eb5054c layer.conf: Update to whinlatter release series
90d52e2 bazel-native: set S from UNPACKDIR in recipes that use only local files

docker-lge @ ~/layers/meta-tensorflow $ git diff origin/master origin/whinlatter

classes/bazel.bbclass +2 -0
index f6585e0..8fca205 100644
@@ -149,6 +149,8 @@ EOF
 
 EXPORT_FUNCTIONS do_configure
 
+PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/bazel"
+
 inherit unsupportarch
 
 export YOCTO_NATIVE_SYSROOT =

"${BAZEL_OUTPUTBASE_DIR}/external/yocto_compiler/recipe-sysroot-native"

Quoted 39 lines · Hongxu Jia

On 7/18/25 15:12, Martin Jansa wrote:

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

On Wed, Jul 16, 2025 at 9:06 AM Hongxu Jia <[email protected]> wrote:

On 7/16/25 14:49, Martin Jansa wrote:

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Hongxu Jia looks like you've created very similar commits for whinlatter compatibility recently.

Do you monitor this ML for meta-tensorflow changes?

Sorry for the missing, I will take care of it next time

OK, will try to remember to Cc you directly if I'm sending some meta-tensorflow patches in future.

Can you please check what happened with master branch? there was 27237386b61 classes/bazel.bbclass: remove PSEUDO_IGNORE_PATHS around 2 days ago and now it's gone, did you remove it and force-pushed master (please don't do that, pushing new revert commit instead would be appreciated) or did it disappear due to some syncing issues in infrastructure?

I have noticed because our CI is failing either to fetch 27237386b61 or trying to "upgrade" from 27237386b61 to previous eb5054ccf48 without any git log between them.

Got [27237386b61 classes/bazel.bbclass: remove PSEUDO_IGNORE_PATHS] back, there is a web hook in github to sync with https://git.yoctoproject.org/meta-tensorflow

You could git pull to latest

//Hongxu

#7 lore raw

Re: [meta-tensorflow][PATCH 2/3] bazel-native: adapt to UNPACKDIR changes - avoid WORKDIR/sources

Quoted 9 lines · Martin Jansa

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Hi,
can you check whinlatter branch? It's out of sync with master branch 27237386b61 classes/bazel.bbclass: remove PSEUDO_IGNORE_PATHS was now removed in whinlatter branch (as it was previously removed from master branch and then restored).

Quoted 5 lines

Fetching origin
Fromhttps://git.yoctoproject.org/meta-tensorflow

    2723738..38cfa43  master     -> origin/master
    024c8dd..5865dad  walnascar  -> origin/walnascar

+ 2723738...f1e0f9d whinlatter -> origin/whinlatter (forced update)

Sorry for the out of sync, I've manually sync whinlatter and master

//Hongxu

Quoted 79 lines

docker-lge @ ~/layers/meta-tensorflow $ git log --oneline 2723738..38cfa43 38cfa43 (origin/master, origin/HEAD, g/master, g/HEAD) tensorflow.inc:
fix compile fail with DEBUG_BUILD = "1" for cortexa53 docker-lge @ ~/layers/meta-tensorflow $ git log --oneline 024c8dd..5865dad 5865dad (origin/walnascar, g/walnascar) tensorflow.inc: fix compile fail with DEBUG_BUILD = "1" for cortexa53
docker-lge @ ~/layers/meta-tensorflow $ git log --oneline 2723738...f1e0f9d f1e0f9d (origin/whinlatter, g/whinlatter) tensorflow.inc: fix compile fail with DEBUG_BUILD = "1" for cortexa53
2723738 (HEAD -> jansa/master, contrib/jansa/master, master) classes/bazel.bbclass: remove PSEUDO_IGNORE_PATHS

docker-lge @ ~/layers/meta-tensorflow $ git log --oneline origin/master | head -n 3
38cfa43 tensorflow.inc: fix compile fail with DEBUG_BUILD = "1" for cortexa53 2723738 classes/bazel.bbclass: remove PSEUDO_IGNORE_PATHS
eb5054c layer.conf: Update to whinlatter release series

docker-lge @ ~/layers/meta-tensorflow $ git log --oneline origin/whinlatter | head -n 3
f1e0f9d tensorflow.inc: fix compile fail with DEBUG_BUILD = "1" for cortexa53 eb5054c layer.conf: Update to whinlatter release series
90d52e2 bazel-native: set S from UNPACKDIR in recipes that use only local files

docker-lge @ ~/layers/meta-tensorflow $ git diff origin/master origin/whinlatter

classes/bazel.bbclass +2 -0
index f6585e0..8fca205 100644
@@ -149,6 +149,8 @@ EOF
 
  EXPORT_FUNCTIONS do_configure
 
+PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/bazel"
+
  inherit unsupportarch
 
  export YOCTO_NATIVE_SYSROOT =

"${BAZEL_OUTPUTBASE_DIR}/external/yocto_compiler/recipe-sysroot-native"

Quoted 38 lines · Hongxu Jia

On 7/18/25 15:12, Martin Jansa wrote:

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

On Wed, Jul 16, 2025 at 9:06 AM Hongxu Jia<[email protected]> wrote:

On 7/16/25 14:49, Martin Jansa wrote:

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Hongxu Jia looks like you've created very similar commits for whinlatter compatibility recently.

Do you monitor this ML for meta-tensorflow changes?

Sorry for the missing, I will take care of it next time

OK, will try to remember to Cc you directly if I'm sending some meta-tensorflow patches in future.

Can you please check what happened with master branch? there was 27237386b61 classes/bazel.bbclass: remove PSEUDO_IGNORE_PATHS around 2 days ago and now it's gone, did you remove it and force-pushed master (please don't do that, pushing new revert commit instead would be appreciated) or did it disappear due to some syncing issues in infrastructure?

I have noticed because our CI is failing either to fetch 27237386b61 or trying to "upgrade" from 27237386b61 to previous eb5054ccf48 without any git log between them.

Got [27237386b61 classes/bazel.bbclass: remove PSEUDO_IGNORE_PATHS] back, there is a web hook in github to sync withhttps://git.yoctoproject.org/meta-tensorflow

You could git pull to latest

//Hongxu

#8 lore raw

PATCH 3/3 layer.conf: Update to release name series to whinlatter

In reply to [email protected]

From: Martin Jansa <[email protected]>

Changed in:
https://git.openembedded.org/openembedded-core/commit/?id=75eb26e71dba4096d5632b7f6b13db4f13aa6d7f
due to incompatible changes.

---
 conf/layer.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
conf/layer.conf +1 -1
index e0fbc64..8ea32c4 100644
@@ -11,7 +11,7 @@ BBFILE_PRIORITY_meta-tensorflow = "10"
 
 LAYERVERSION_meta-tensorflow = "1"
 
-LAYERSERIES_COMPAT_meta-tensorflow = "walnascar"
+LAYERSERIES_COMPAT_meta-tensorflow = "whinlatter"
 
 LAYERDEPENDS_meta-tensorflow = " \
     core \