]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
classes/spdx-common: Fix patch error for recipes that inherit dos2unix.
authorHongxu Jia <hongxu.jia@windriver.com>
Wed, 22 Jan 2025 04:42:45 +0000 (12:42 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 29 Jan 2025 10:40:39 +0000 (10:40 +0000)
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>
meta/lib/oe/spdx_common.py

index ff18d917800febee6f7ef0f1fd5f3c967e273788..23a17271d6c6ad40d75e981b1ec79c6ddee9592c 100644 (file)
@@ -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