summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiclas Svensson <niclass@axis.com>2019-09-20 22:30:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-27 13:02:16 +0100
commita70e1fdba262b4787b03624eacb9ae59bd84931c (patch)
treed7aa1ff88473b959e6ce75c68e05546248ca11c5
parentb6e5346f46025699841f41fbe96680a1e1f01cad (diff)
downloadpoky-a70e1fdba262b4787b03624eacb9ae59bd84931c.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: 69b7a2ba3af1280cc220ab236032f8466246ee93) 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>
-rw-r--r--scripts/lib/devtool/standard.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 9eeaefb79c..64fa420bf1 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1619,17 +1619,17 @@ def _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wil
1619 patches_dir, changed_revs) 1619 patches_dir, changed_revs)
1620 logger.debug('Pre-filtering: update: %s, new: %s' % (dict(upd_p), dict(new_p))) 1620 logger.debug('Pre-filtering: update: %s, new: %s' % (dict(upd_p), dict(new_p)))
1621 if filter_patches: 1621 if filter_patches:
1622 new_p = {} 1622 new_p = OrderedDict()
1623 upd_p = {k:v for k,v in upd_p.items() if k in filter_patches} 1623 upd_p = OrderedDict((k,v) for k,v in upd_p.items() if k in filter_patches)
1624 remove_files = [f for f in remove_files if f in filter_patches] 1624 remove_files = [f for f in remove_files if f in filter_patches]
1625 updatefiles = False 1625 updatefiles = False
1626 updaterecipe = False 1626 updaterecipe = False
1627 destpath = None 1627 destpath = None
1628 srcuri = (rd.getVar('SRC_URI', False) or '').split() 1628 srcuri = (rd.getVar('SRC_URI', False) or '').split()
1629 if appendlayerdir: 1629 if appendlayerdir:
1630 files = dict((os.path.join(local_files_dir, key), val) for 1630 files = OrderedDict((os.path.join(local_files_dir, key), val) for
1631 key, val in list(upd_f.items()) + list(new_f.items())) 1631 key, val in list(upd_f.items()) + list(new_f.items()))
1632 files.update(dict((os.path.join(patches_dir, key), val) for 1632 files.update(OrderedDict((os.path.join(patches_dir, key), val) for
1633 key, val in list(upd_p.items()) + list(new_p.items()))) 1633 key, val in list(upd_p.items()) + list(new_p.items())))
1634 if files or remove_files: 1634 if files or remove_files:
1635 removevalues = None 1635 removevalues = None