diff mbox series

[meta-tensorflow,1/3] recipes: adapt to UNPACKDIR changes

Message ID 20250708072436.24522-1-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.

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`

Signed-off-by: Martin Jansa <martin2.jansa@lgepartner.com>
---
 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(-)
diff mbox series

Patch

diff --git a/recipes-devtools/openjdk/openjdk-11-native_11.0.15.bb b/recipes-devtools/openjdk/openjdk-11-native_11.0.15.bb
index e982af6..cec79b2 100644
--- a/recipes-devtools/openjdk/openjdk-11-native_11.0.15.bb
+++ b/recipes-devtools/openjdk/openjdk-11-native_11.0.15.bb
@@ -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"
diff --git a/recipes-devtools/python/python3-mldtypes_0.5.1.bb b/recipes-devtools/python/python3-mldtypes_0.5.1.bb
index 1755226..b3f8b98 100644
--- a/recipes-devtools/python/python3-mldtypes_0.5.1.bb
+++ b/recipes-devtools/python/python3-mldtypes_0.5.1.bb
@@ -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 \
diff --git a/recipes-devtools/python/python3-opt-einsum_3.3.0.bb b/recipes-devtools/python/python3-opt-einsum_3.3.0.bb
index ce9d220..4aecbba 100644
--- a/recipes-devtools/python/python3-opt-einsum_3.3.0.bb
+++ b/recipes-devtools/python/python3-opt-einsum_3.3.0.bb
@@ -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"
diff --git a/recipes-framework/tensorflow/keras_2.19.0.bb b/recipes-framework/tensorflow/keras_2.19.0.bb
index 3030f04..f6bcb03 100644
--- a/recipes-framework/tensorflow/keras_2.19.0.bb
+++ b/recipes-framework/tensorflow/keras_2.19.0.bb
@@ -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
 
diff --git a/recipes-framework/tensorflow/tensorflow-estimator_2.15.0.bb b/recipes-framework/tensorflow/tensorflow-estimator_2.15.0.bb
index 012ecc8..e9aee35 100644
--- a/recipes-framework/tensorflow/tensorflow-estimator_2.15.0.bb
+++ b/recipes-framework/tensorflow/tensorflow-estimator_2.15.0.bb
@@ -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
 
diff --git a/recipes-framework/tensorflow/tensorflow.inc b/recipes-framework/tensorflow/tensorflow.inc
index be1ed11..8287032 100644
--- a/recipes-framework/tensorflow/tensorflow.inc
+++ b/recipes-framework/tensorflow/tensorflow.inc
@@ -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 \