summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorleimaohui <leimaohui@fujitsu.com>2021-07-21 18:13:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-24 16:33:42 +0100
commit2ceda7c90c0087f52693c54d5ccab143b27f4d21 (patch)
tree9430d59ca2ef053a4ccc85f328e169ebdeb1fc7b
parent08cd144fc4b5ac34ff99f71b1d825cbff96b642c (diff)
downloadopenembedded-core-2ceda7c90c0087f52693c54d5ccab143b27f4d21.tar.gz
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>
-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 a3962306b1..900268971c 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -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)