On Sun, 2025-01-05 at 12:47 +0100, Ming Liu via lists.openembedded.org wrote:
> For the recipes inheriting dos2unix, do_patch will fail if
> do_convert_crlf_to_lf not run before it.
> 
> Signed-off-by: Ming Liu <liu.min...@gmail.com>
> ---
>  meta/classes/create-spdx.bbclass | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta/classes/create-spdx.bbclass 
> b/meta/classes/create-spdx.bbclass
> index 349ecfe6ab..26d586744e 100644
> --- a/meta/classes/create-spdx.bbclass
> +++ b/meta/classes/create-spdx.bbclass
> @@ -810,6 +810,8 @@ def spdx_get_src(d):
>  
>          # Make sure gcc and kernel sources are patched only once
>          if not (d.getVar('SRC_URI') == "" or is_work_shared_spdx(d)):
> +            if bb.data.inherits_class('dos2unix', d):
> +                bb.build.exec_func('do_convert_crlf_to_lf', d)
>              bb.build.exec_func('do_patch', d)
>  
>          # Some userland has no source.
> 

This is not in master so shouldn't be applied to kirkstone or other branches 
yet.

I'm also not convinced this is the right fix. We may want to convert
do_convert_crlf_to_lf from a separate task to a postfunc for do_unpack
or a prefunc for do_patch if it is required it always run at that
point.

Cheers,

Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#209423): 
https://lists.openembedded.org/g/openembedded-core/message/209423
Mute This Topic: https://lists.openembedded.org/mt/110437432/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to