diff mbox series

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

Message ID 20250708072436.24522-2-martin.jansa@gmail.com
State New
Headers show
Series [meta-tensorflow,1/3] recipes: adapt to UNPACKDIR changes | expand

Commit Message

Martin Jansa July 8, 2025, 7:24 a.m. UTC
From: Martin Jansa <martin2.jansa@lgepartner.com>

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.

Signed-off-by: Martin Jansa <martin2.jansa@lgepartner.com>
---
 recipes-devtools/bazel/bazel-native_6.0.0.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Martin Jansa July 16, 2025, 6:49 a.m. UTC | #1
Hongxu Jia looks like you've created very similar commits for
whinlatter compatibility recently.

Do you monitor this ML for meta-tensorflow changes?

On Tue, Jul 8, 2025 at 9:24 AM <martin.jansa@gmail.com> wrote:
>
> From: Martin Jansa <martin2.jansa@lgepartner.com>
>
> 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.
>
> Signed-off-by: Martin Jansa <martin2.jansa@lgepartner.com>
> ---
>  recipes-devtools/bazel/bazel-native_6.0.0.bb | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/recipes-devtools/bazel/bazel-native_6.0.0.bb b/recipes-devtools/bazel/bazel-native_6.0.0.bb
> index 19b411b..ef9dfba 100644
> --- a/recipes-devtools/bazel/bazel-native_6.0.0.bb
> +++ b/recipes-devtools/bazel/bazel-native_6.0.0.bb
> @@ -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 = " \
Hongxu Jia July 16, 2025, 7:06 a.m. UTC | #2
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

//Hongxu


> On Tue, Jul 8, 2025 at 9:24 AM <martin.jansa@gmail.com> wrote:
>> From: Martin Jansa <martin2.jansa@lgepartner.com>
>>
>> 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.
>>
>> Signed-off-by: Martin Jansa <martin2.jansa@lgepartner.com>
>> ---
>>   recipes-devtools/bazel/bazel-native_6.0.0.bb | 6 ++----
>>   1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/recipes-devtools/bazel/bazel-native_6.0.0.bb b/recipes-devtools/bazel/bazel-native_6.0.0.bb
>> index 19b411b..ef9dfba 100644
>> --- a/recipes-devtools/bazel/bazel-native_6.0.0.bb
>> +++ b/recipes-devtools/bazel/bazel-native_6.0.0.bb
>> @@ -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 = " \
Martin Jansa July 18, 2025, 7:12 a.m. UTC | #3
On Wed, Jul 16, 2025 at 9:06 AM Hongxu Jia <hongxu.jia@windriver.com> 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.
Hongxu Jia July 18, 2025, 7:19 a.m. UTC | #4
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<hongxu.jia@windriver.com>  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
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 19b411b..ef9dfba 100644
--- a/recipes-devtools/bazel/bazel-native_6.0.0.bb
+++ b/recipes-devtools/bazel/bazel-native_6.0.0.bb
@@ -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 = " \