summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-08-31 11:54:08 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 23:30:02 +0100
commit69d50eb9ec2e8dc696aac13d0ffbf890fd4ce0e6 (patch)
tree199711a420cc2eae829a87f039056b01a35f8cdd /scripts
parent34580ac2872da6ae70d5269eb107d31cd5239ad7 (diff)
downloadpoky-69d50eb9ec2e8dc696aac13d0ffbf890fd4ce0e6.tar.gz
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. (From OE-Core rev: 56bf5e93358187e31160d7893f57906bb3dc7ad7) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/upgrade.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 24937dcd20..297d646f55 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -300,7 +300,7 @@ def _create_new_recipe(newpv, md5, sha256, srcrev, srcbranch, workspace, tinfoil
300 bpn = rd.getVar('BPN') 300 bpn = rd.getVar('BPN')
301 path = os.path.join(workspace, 'recipes', bpn) 301 path = os.path.join(workspace, 'recipes', bpn)
302 bb.utils.mkdirhier(path) 302 bb.utils.mkdirhier(path)
303 copied, _ = oe.recipeutils.copy_recipe_files(rd, path) 303 copied, _ = oe.recipeutils.copy_recipe_files(rd, path, all_variants=True)
304 if not copied: 304 if not copied:
305 raise DevtoolError('Internal error - no files were copied for recipe %s' % bpn) 305 raise DevtoolError('Internal error - no files were copied for recipe %s' % bpn)
306 logger.debug('Copied %s to %s' % (copied, path)) 306 logger.debug('Copied %s to %s' % (copied, path))