From: leimaohui <leimaohui@fujitsu.com>
Date: Wed, 21 Jul 2021 10:13:50 +0000 (+0800)
Subject: archiver.bbclass: Fix patch error for recipes that inherit dos2unix.
X-Git-Tag: yocto-3.1.11~107
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3e8cb257546e00a988136dfa6d7f5e6b7f7f16d8;p=openembedded-core.git

archiver.bbclass: Fix patch error for recipes that inherit dos2unix.

do_unpack_and_patch error happens for these recipes inherit dos2unix.

Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2ceda7c90c0087f52693c54d5ccab143b27f4d21)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 7ca35a573b..49717d4f57 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -484,6 +484,9 @@ python do_unpack_and_patch() {
         src_orig = '%s.orig' % src
         oe.path.copytree(src, src_orig)
 
+    if bb.data.inherits_class('dos2unix', d):
+        bb.build.exec_func('do_convert_crlf_to_lf', d)
+
     # Make sure gcc and kernel sources are patched only once
     if not (d.getVar('SRC_URI') == "" or is_work_shared(d)):
         bb.build.exec_func('do_patch', d)