]> code.ossystems Code Review - openembedded-core.git/commit
devtool: upgrade: workaround for recipes which apply patches conditional upon class
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Wed, 30 Aug 2017 23:54:08 +0000 (11:54 +1200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 31 Aug 2017 22:25:32 +0000 (23:25 +0100)
commit56bf5e93358187e31160d7893f57906bb3dc7ad7
treeae04c3001d9db154c42fd3be718caa2d1d091528
parent3861486ad06f90c8644ebab119bbc5ddb9e693ca
devtool: upgrade: workaround for recipes which apply patches conditional upon class

If we're upgrading a recipe that appends additional patches for, say,
class-native, and we're just upgrading the target variant, then when we
copied the recipe into the workspace we skipped copying the additional patches
for the native variant. This caused warnings because the workspace
recipe is preferred. Look at SRC_URI for all variants when copying files
to work around this.

More work is needed to make it easier to work with recipes that use
BBCLASSEXTEND where you need to build more than one variant at once, but
this at least fixes the immediate ugliness.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/recipeutils.py
scripts/lib/devtool/upgrade.py