mirror of
https://git.yoctoproject.org/poky
synced 2026-02-09 02:03:04 +01:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
ffc49508d2
commit
184ade83cd
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user