diff options
author | Niclas Svensson <niclass@axis.com> | 2019-11-05 23:08:37 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-18 14:42:12 +0000 |
commit | e2e2e4390b88b4503c469daf65c2b5ea401ab28b (patch) | |
tree | 2f5d63083eda155f96403e5942d6d04a9c891ed0 /scripts/lib | |
parent | 2bfa6ffb66f59d0ff2c807009da81936d8a55b6c (diff) | |
download | poky-e2e2e4390b88b4503c469daf65c2b5ea401ab28b.tar.gz |
devtool: finish: Keep patches ordered when updating bbappend
The _get_patchset_revs() function returns the patches in an
OrderedDict to keep them ordered. However, this information was lost
when the patches were added to the bbappend file.
(From OE-Core rev: 62f79dbbc656dc72423a7788ed7439e7d730fd81)
Signed-off-by: Niclas Svensson <niclas.svensson@axis.com>
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/devtool/standard.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index dcb6bf9540..b944ec3966 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -1520,17 +1520,17 @@ def _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wil | |||
1520 | patches_dir, changed_revs) | 1520 | patches_dir, changed_revs) |
1521 | logger.debug('Pre-filtering: update: %s, new: %s' % (dict(upd_p), dict(new_p))) | 1521 | logger.debug('Pre-filtering: update: %s, new: %s' % (dict(upd_p), dict(new_p))) |
1522 | if filter_patches: | 1522 | if filter_patches: |
1523 | new_p = {} | 1523 | new_p = OrderedDict() |
1524 | upd_p = {k:v for k,v in upd_p.items() if k in filter_patches} | 1524 | upd_p = OrderedDict((k,v) for k,v in upd_p.items() if k in filter_patches) |
1525 | remove_files = [f for f in remove_files if f in filter_patches] | 1525 | remove_files = [f for f in remove_files if f in filter_patches] |
1526 | updatefiles = False | 1526 | updatefiles = False |
1527 | updaterecipe = False | 1527 | updaterecipe = False |
1528 | destpath = None | 1528 | destpath = None |
1529 | srcuri = (rd.getVar('SRC_URI', False) or '').split() | 1529 | srcuri = (rd.getVar('SRC_URI', False) or '').split() |
1530 | if appendlayerdir: | 1530 | if appendlayerdir: |
1531 | files = dict((os.path.join(local_files_dir, key), val) for | 1531 | files = OrderedDict((os.path.join(local_files_dir, key), val) for |
1532 | key, val in list(upd_f.items()) + list(new_f.items())) | 1532 | key, val in list(upd_f.items()) + list(new_f.items())) |
1533 | files.update(dict((os.path.join(patches_dir, key), val) for | 1533 | files.update(OrderedDict((os.path.join(patches_dir, key), val) for |
1534 | key, val in list(upd_p.items()) + list(new_p.items()))) | 1534 | key, val in list(upd_p.items()) + list(new_p.items()))) |
1535 | if files or remove_files: | 1535 | if files or remove_files: |
1536 | removevalues = None | 1536 | removevalues = None |