[oe-commits] [openembedded-core] 59/59: package.bbclass: fix strip and split logic

[git at git.openembedded.org]

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

commit 96a603b286ba22b0067ef103984108010590cd02
Author: Stephano Cetola <stephano.cetola at linux.intel.com>
AuthorDate: 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
    
    Signed-off-by: Stephano Cetola <stephano.cetola at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/package.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)

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