summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephano Cetola <stephano.cetola@linux.intel.com>2016-05-26 13:40:37 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-01 08:04:12 +0100
commit0df6dabdf0a61ae7b99c6a792f1eec754a7b23bd (patch)
tree7c9fdc6f8e15e509bdfa0430d41d7354e365c42a
parent2e498879098f7d84610aed7961d92433083d9a02 (diff)
downloadopenembedded-core-contrib-0df6dabdf0a61ae7b99c6a792f1eec754a7b23bd.tar.gz
openembedded-core-contrib-0df6dabdf0a61ae7b99c6a792f1eec754a7b23bd.tar.bz2
openembedded-core-contrib-0df6dabdf0a61ae7b99c6a792f1eec754a7b23bd.zip
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@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass3
1 files changed, 2 insertions, 1 deletions
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)