[oe-commits] [openembedded-core] 02/19: devtool: update-recipe: ensure patches get deleted in srcrev mode

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit ff495d4a709fc70e12623532db1701f07ebadda1
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Thu Aug 31 11:54:05 2017 +1200

    devtool: update-recipe: ensure patches get deleted in srcrev mode
    
    Patches that we identify as having been "deleted" (i.e. patches in
    SRC_URI that no longer appear in the git tree) need to be dropped even
    if we're updating in srcrev mode. This fixes the case where HEAD of the
    git tree is valid upstream (i.e. no extra commits), but there are
    patches left over in the recipe, e.g. when we do devtool upgrade and
    then all of the commits rebased on top of the new branch get skipped.
    
    Fixes [YOCTO #11972].
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/devtool/standard.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index fa9d347..d79ebf1 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1352,9 +1352,10 @@ def _update_recipe_srcrev(srctree, rd, appendlayerdir, wildcard_version, no_remo
             old_srcrev = (rd.getVar('SRCREV', False) or '')
             upd_p, new_p, del_p = _export_patches(srctree, rd, old_srcrev,
                                                   patches_dir)
+            logger.debug('Patches: update %s, new %s, delete %s' % (dict(upd_p), dict(new_p), dict(del_p)))
 
             # Remove deleted local files and "overlapping" patches
-            remove_files = list(del_f.values()) + list(upd_p.values())
+            remove_files = list(del_f.values()) + list(upd_p.values()) + list(del_p.values())
             if remove_files:
                 removedentries = _remove_file_entries(srcuri, remove_files)[0]
                 update_srcuri = True

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.