From fde0f2d81a6226384230f21a954c60723dbb45c3 Mon Sep 17 00:00:00 2001
From: Francesco Pham <francesco.pham@huawei.com>
Date: Tue, 20 Dec 2022 14:46:30 +0100
Subject: [PATCH] zephyr-kernel: refresh 0001-cmake-add-yocto-toolchain.patch
to fix fuzz
Fixing patch fuzz:
```
WARNING: zephyr-kernel-src-3.1.0+gitAUTOINC+2ddd73feaf_5f86244bad-r0 do_patch: Fuzz detected:
Applying patch 0001-cmake-add-yocto-toolchain.patch
patching file cmake/compiler/gcc/target.cmake
Hunk #1 succeeded at 94 with fuzz 1 (offset 26 lines).
patching file cmake/toolchain/yocto/generic.cmake
patching file cmake/toolchain/yocto/target.cmake
```
Fixes: https://gitlab.eclipse.org/eclipse/oniro-core/meta-zephyr/-/issues/32
Signed-off-by: Francesco Pham <francesco.pham@huawei.com>
---
.../files/0001-cmake-add-yocto-toolchain.patch | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch b/meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch
index 563af7d..f0ad1e3 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch
@@ -1,4 +1,4 @@
-From bfab268c870548e3e7a24ea67ebed2a0513b2307 Mon Sep 17 00:00:00 2001
+From 69ecc7edc83a2c6576005db7075a71ef0cf26943 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Wed, 7 Jul 2021 13:53:05 +0800
Subject: [PATCH] cmake: add yocto toolchain
@@ -6,6 +6,7 @@ Subject: [PATCH] cmake: add yocto toolchain
Upstream status: inappropriate [OE specific]
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+
---
cmake/compiler/gcc/target.cmake | 7 -------
cmake/toolchain/yocto/generic.cmake | 13 +++++++++++++
@@ -15,10 +16,10 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
create mode 100644 cmake/toolchain/yocto/target.cmake
diff --git a/cmake/compiler/gcc/target.cmake b/cmake/compiler/gcc/target.cmake
-index 2b90c5d2ef..b6f28b2f87 100644
+index 014447e67e..b510f47d59 100644
--- a/cmake/compiler/gcc/target.cmake
+++ b/cmake/compiler/gcc/target.cmake
-@@ -68,13 +68,6 @@ execute_process(
+@@ -94,13 +94,6 @@ execute_process(
OUTPUT_STRIP_TRAILING_WHITESPACE
)
@@ -31,7 +32,7 @@ index 2b90c5d2ef..b6f28b2f87 100644
-LIST(APPEND LIB_INCLUDE_DIR "-L\"${LIBGCC_DIR}\"")
LIST(APPEND TOOLCHAIN_LIBS gcc)
- if(SYSROOT_DIR)
+ # For CMake to be able to test if a compiler flag is supported by the
diff --git a/cmake/toolchain/yocto/generic.cmake b/cmake/toolchain/yocto/generic.cmake
new file mode 100644
index 0000000000..45e5777e2a
@@ -58,6 +59,3 @@ index 0000000000..9881313609
+++ b/cmake/toolchain/yocto/target.cmake
@@ -0,0 +1 @@
+# SPDX-License-Identifier: Apache-2.0
---
-2.17.1
-
--
GitLab