From: Stephano Cetola Date: Thu, 26 May 2016 20:40:37 +0000 (-0700) Subject: package.bbclass: fix strip and split logic X-Git-Tag: uninative-1.3~880 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0df6dabdf0a61ae7b99c6a792f1eec754a7b23bd;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index ffd4eff7b1..a4125a0e98 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)