]> code.ossystems Code Review - openembedded-core.git/commitdiff
archiver.bbclass: Fix patch error for recipes that inherit dos2unix.
authorleimaohui <leimaohui@fujitsu.com>
Wed, 21 Jul 2021 10:13:50 +0000 (18:13 +0800)
committerAnuj Mittal <anuj.mittal@intel.com>
Sat, 31 Jul 2021 09:56:12 +0000 (17:56 +0800)
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: Anuj Mittal <anuj.mittal@intel.com>
meta/classes/archiver.bbclass

index a3962306b11bc4dd4d16c0b85cb78fa1b91e7b92..900268971c7484bc77e9312fdb48915bef88953f 100644 (file)
@@ -483,6 +483,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)