From: Niclas Svensson
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.
Signed-off-by: Niclas Svensson
Signed-off-by: Peter Kjellerstedt
---
scripts/lib/devtool/standard.py | 8
1 file 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
patches_dir, changed_revs)
logger.debug('Pre-filtering: update: %s, new: %s' % (dict(upd_p),
dict(new_p)))
if filter_patches:
-new_p = {}
-upd_p = {k:v for k,v in upd_p.items() if k in filter_patches}
+new_p = OrderedDict()
+upd_p = OrderedDict((k,v) for k,v in upd_p.items() if k in
filter_patches)
remove_files = [f for f in remove_files if f in filter_patches]
updatefiles = False
updaterecipe = False
destpath = None
srcuri = (rd.getVar('SRC_URI', False) or '').split()
if appendlayerdir:
-files = dict((os.path.join(local_files_dir, key), val) for
+files = OrderedDict((os.path.join(local_files_dir, key), val) for
key, val in list(upd_f.items()) + list(new_f.items()))
-files.update(dict((os.path.join(patches_dir, key), val) for
+files.update(OrderedDict((os.path.join(patches_dir, key), val) for
key, val in list(upd_p.items()) +
list(new_p.items(
if files or remove_files:
removevalues = None
--
2.21.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
