From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Wed, 22 Jan 2025 04:42:45 +0000 (+0800)
Subject: classes/spdx-common: Fix patch error for recipes that inherit dos2unix.
X-Git-Tag: yocto-5.2~681
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7051bfb8ff67a6f0c394ce0f559eb53a05cde472;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

classes/spdx-common: Fix patch error for recipes that inherit dos2unix.

While SPDX_INCLUDE_SOURCES = "1", do_create_spdx error happens for
these recipes inherit dos2unix

Refer [1] to fix the issue

[1] https://git.openembedded.org/openembedded-core/commit/?id=2ceda7c90c0087f52693c54d5ccab143b27f4d21

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oe/spdx_common.py b/meta/lib/oe/spdx_common.py
index ff18d917800..23a17271d6c 100644
--- a/meta/lib/oe/spdx_common.py
+++ b/meta/lib/oe/spdx_common.py
@@ -187,6 +187,8 @@ def get_patched_src(d):
             bb.build.exec_func("do_unpack", d)
 
             if d.getVar("SRC_URI") != "":
+                if bb.data.inherits_class('dos2unix', d):
+                    bb.build.exec_func('do_convert_crlf_to_lf', d)
                 bb.build.exec_func("do_patch", d)
 
         # Copy source from work-share to spdx_workdir