diff mbox series

[meta-tensorflow,kirkstone,1/2] tensorflow: drop Upstream-Status inside third_party .patch files

Message ID 20250211161516.3084692-1-martin.jansa@gmail.com
State New
Headers show
Series [meta-tensorflow,kirkstone,1/2] tensorflow: drop Upstream-Status inside third_party .patch files | expand

Commit Message

Martin Jansa Feb. 11, 2025, 4:15 p.m. UTC
* these patches create:
  third_party/0001-XNNPACK-support-32-bit-x86.patch
  third_party/0001-cpuinfo-support-32-bit-x86.patch
  third_party/eigen3/0001-workaround-ice-failure-while-building-from-source-wi.patch

  which aren't applied by do_patch bitbake task but by bazel:

  tensorflow $ grep patch_file tensorflow/workspace2.bzl | head -n 2
  tensorflow/workspace2.bzl: patch_file = ["//third_party:0001-XNNPACK-support-32-bit-x86.patch"],
  tensorflow/workspace2.bzl: patch_file = ["//third_party:0001-cpuinfo-support-32-bit-x86.patch"],
  third_party/eigen3/workspace.bzl: patch_file = ["//third_party/eigen3:0001-workaround-ice-failure-while-building-from-source-wi.patch"],

  so they don't really need Upstream-Status and including it there
  might cause false possitive e.g. in
  0001-fix-XNNPACK-build-failure-for-qemuarm.patch

  ERROR: tensorflow-lite-2.10.0-r0 do_patch: QA Issue: Malformed Upstream-Status in patch
  recipes-framework/tensorflow/tensorflow-lite/0001-fix-XNNPACK-build-failure-for-qemuarm.patch
  Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status :
   Upstream-Status: Inappropriate [oe specific] [patch-status]
  ERROR: tensorflow-lite-2.10.0-r0 do_patch: Fatal QA errors were found, failing task.

  caused by extra space before Upstream-Status

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
 .../files/0001-support-32-bit-x64-and-arm-for-yocto.patch  | 7 ++-----
 ...rd_party-eigen_archive-workaround-ice-failure-whi.patch | 4 +---
 2 files changed, 3 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/recipes-framework/tensorflow/files/0001-support-32-bit-x64-and-arm-for-yocto.patch b/recipes-framework/tensorflow/files/0001-support-32-bit-x64-and-arm-for-yocto.patch
index 45e7c6d..5eae2fd 100644
--- a/recipes-framework/tensorflow/files/0001-support-32-bit-x64-and-arm-for-yocto.patch
+++ b/recipes-framework/tensorflow/files/0001-support-32-bit-x64-and-arm-for-yocto.patch
@@ -55,7 +55,7 @@  new file mode 100644
 index 00000000000..2141c37236b
 --- /dev/null
 +++ b/third_party/0001-XNNPACK-support-32-bit-x86.patch
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,27 @@
 +From 2345756776fa09fd95e29f96f781e15e3b18a61b Mon Sep 17 00:00:00 2001
 +From: Hongxu Jia <hongxu.jia@windriver.com>
 +Date: Tue, 17 Aug 2021 01:09:53 -0700
@@ -63,8 +63,6 @@  index 00000000000..2141c37236b
 +
 +Use android_x86 as a workaround to support 32 bit x86
 +
-+Upstream-Status: Inappropriate [oe specific]
-+
 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 +---
 + BUILD.bazel | 1 -
@@ -90,7 +88,7 @@  new file mode 100644
 index 00000000000..0c83cf01675
 --- /dev/null
 +++ b/third_party/0001-cpuinfo-support-32-bit-x86.patch
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,27 @@
 +From f5e52b2db5516954dab9026e4f386982c4c3c3a4 Mon Sep 17 00:00:00 2001
 +From: Hongxu Jia <hongxu.jia@windriver.com>
 +Date: Mon, 19 Sep 2022 00:10:18 -0700
@@ -98,7 +96,6 @@  index 00000000000..0c83cf01675
 +
 +Use android_x86 as a workaround to support 32 bit x86
 +
-+Upstream-Status: Inappropriate [oe specific]
 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 +---
 + BUILD.bazel | 1 -
diff --git a/recipes-framework/tensorflow/files/0001-third_party-eigen_archive-workaround-ice-failure-whi.patch b/recipes-framework/tensorflow/files/0001-third_party-eigen_archive-workaround-ice-failure-whi.patch
index b1571ab..2056c20 100644
--- a/recipes-framework/tensorflow/files/0001-third_party-eigen_archive-workaround-ice-failure-whi.patch
+++ b/recipes-framework/tensorflow/files/0001-third_party-eigen_archive-workaround-ice-failure-whi.patch
@@ -24,7 +24,7 @@  new file mode 100644
 index 00000000000..436f35fca13
 --- /dev/null
 +++ b/third_party/eigen3/0001-workaround-ice-failure-while-building-from-source-wi.patch
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,67 @@
 +From 035fd96026e18d61c19da038ab2b0f7a61e97799 Mon Sep 17 00:00:00 2001
 +From: Hongxu Jia <hongxu.jia@windriver.com>
 +Date: Mon, 19 Sep 2022 01:08:18 -0700
@@ -37,8 +37,6 @@  index 00000000000..436f35fca13
 +But we could not patch on native gcc,so try to workaround,
 +Refer: https://github.com/tensorflow/tensorflow/issues/25323
 +
-+Upstream-Status: Inappropriate [wr-installer specific]
-+
 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 +---
 + unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h | 3 ++-