[gnome-continuous-yocto/gnomeostree-3.28-rocko: 593/8267] package.bbclass: fix strip and split logic

[Emmanuele Bassi <ebassi src gnome org>]

commit af587b86f5b67f280f070cb4e2671c48909d2079
Author: Stephano Cetola <stephano cetola linux intel com>
Date:   Thu May 26 13:40:37 2016 -0700

    package.bbclass: fix strip and split logic
    
    In order for strip and split to work together, we need to populate the
    data structors if either split OR strip are not inhibited.
    
    Original behaviour:
    
    INHIBIT_PACKAGE_STRIP: no strip, no debug split
    INHIBIT_PACKAGE_DEBUG_SPLIT: strip, no split
    
    Behaviour after this patch:
    
    INHIBIT_PACKAGE_STRIP: no strip, debug split
    INHIBIT_PACKAGE_DEBUG_SPLIT: strip, no split
    BOTH: no strip, no split, DNP data structures
    
    (From OE-Core rev: 0df6dabdf0a61ae7b99c6a792f1eec754a7b23bd)
    
    Signed-off-by: Stephano Cetola <stephano cetola linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/package.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index ffd4eff..a4125a0 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -903,7 +903,8 @@ python split_and_strip_files () {
     inodes = {}
     libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir", True))
     baselibdir = os.path.abspath(dvar + os.sep + d.getVar("base_libdir", True))
-    if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
+    if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1' or \
+            d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT', True) != '1'):
         for root, dirs, files in cpath.walk(dvar):
             for f in files:
                 file = os.path.join(root, f)