]> code.ossystems Code Review - openembedded-core.git/commit
staging: Handle files moving between dependencies
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 4 Nov 2019 17:27:52 +0000 (17:27 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 7 Nov 2019 11:45:25 +0000 (11:45 +0000)
commite3e5ace6e68d5fe68e4add301a44c1a1b8607411
tree5d9c17b27653abd74e4d02cceff978ae6be864d4
parentccb65286b955d44dacd5fc794851a0c313d116a6
staging: Handle files moving between dependencies

Currently, if files move between recipes, do_prepare_sysroot can fail with a message like

Exception: FileExistsError: [Errno 17] File exists:
'TMPDIR/sysroots-components/core2-64/libx11/usr/include/X11/extensions/XKBgeom.h' ->
'TMPDIR/work/core2-64-poky-linux/gtk+3/3.24.8-r0/recipe-sysroot/usr/include/X11/extensions/XKBgeom.h'

This is because files are removed and then added per package. What needs to
happen is all removes need to be processed, then all additions.

This patch changes the code to process in two phases, removals first, then additions,
which avoids the problem.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/staging.bbclass