summaryrefslogtreecommitdiffstats
path: root/meta/classes
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 12:38:43 +0100
commitaf587b86f5b67f280f070cb4e2671c48909d2079 (patch)
treef93ce06bb85b751d5e3c88f0abe0552edd8d8cf3 /meta/classes
parent5efe4c9a64afe4b5489f1b95d9ade22768841da6 (diff)
downloadpoky-af587b86f5b67f280f070cb4e2671c48909d2079.tar.gz
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>
Diffstat (limited to 'meta/classes')
-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 () {
903 inodes = {} 903 inodes = {}
904 libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir", True)) 904 libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir", True))
905 baselibdir = os.path.abspath(dvar + os.sep + d.getVar("base_libdir", True)) 905 baselibdir = os.path.abspath(dvar + os.sep + d.getVar("base_libdir", True))
906 if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'): 906 if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1' or \
907 d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT', True) != '1'):
907 for root, dirs, files in cpath.walk(dvar): 908 for root, dirs, files in cpath.walk(dvar):
908 for f in files: 909 for f in files:
909 file = os.path.join(root, f) 910 file = os.path.join(root, f)