diff options
author | leimaohui <leimaohui@fujitsu.com> | 2021-07-21 18:13:50 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-06 09:59:14 +0100 |
commit | 45606eacf8a231337463f5b040a8d4d1d876a35e (patch) | |
tree | 800dddc60ed91a3167ef75473b610217cdcc043f /meta | |
parent | cc3d160b3ff8934d244c76c291a4a6baef32e0e1 (diff) | |
download | poky-45606eacf8a231337463f5b040a8d4d1d876a35e.tar.gz |
archiver.bbclass: Fix patch error for recipes that inherit dos2unix.
do_unpack_and_patch error happens for these recipes inherit dos2unix.
(From OE-Core rev: d2405585f0bcdf80950fb41438168d622b1c3181)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/archiver.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index a3962306b1..900268971c 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass | |||
@@ -483,6 +483,9 @@ python do_unpack_and_patch() { | |||
483 | src_orig = '%s.orig' % src | 483 | src_orig = '%s.orig' % src |
484 | oe.path.copytree(src, src_orig) | 484 | oe.path.copytree(src, src_orig) |
485 | 485 | ||
486 | if bb.data.inherits_class('dos2unix', d): | ||
487 | bb.build.exec_func('do_convert_crlf_to_lf', d) | ||
488 | |||
486 | # Make sure gcc and kernel sources are patched only once | 489 | # Make sure gcc and kernel sources are patched only once |
487 | if not (d.getVar('SRC_URI') == "" or is_work_shared(d)): | 490 | if not (d.getVar('SRC_URI') == "" or is_work_shared(d)): |
488 | bb.build.exec_func('do_patch', d) | 491 | bb.build.exec_func('do_patch', d) |