summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorleimaohui <leimaohui@fujitsu.com>2021-07-21 18:13:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-10 11:14:11 +0100
commit184ade83cdbc86d9aadeca5d81f5a9bfbce8acfb (patch)
tree909815b70b08b5f65e2266c2bd2e822e7a7865da /meta
parentffc49508d227530b23930f31430faba1c9bd1daa (diff)
downloadpoky-184ade83cdbc86d9aadeca5d81f5a9bfbce8acfb.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: 3e8cb257546e00a988136dfa6d7f5e6b7f7f16d8) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/archiver.bbclass3
1 files changed, 3 insertions, 0 deletions
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() {
484 src_orig = '%s.orig' % src 484 src_orig = '%s.orig' % src
485 oe.path.copytree(src, src_orig) 485 oe.path.copytree(src, src_orig)
486 486
487 if bb.data.inherits_class('dos2unix', d):
488 bb.build.exec_func('do_convert_crlf_to_lf', d)
489
487 # Make sure gcc and kernel sources are patched only once 490 # Make sure gcc and kernel sources are patched only once
488 if not (d.getVar('SRC_URI') == "" or is_work_shared(d)): 491 if not (d.getVar('SRC_URI') == "" or is_work_shared(d)):
489 bb.build.exec_func('do_patch', d) 492 bb.build.exec_func('do_patch', d)