summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2014-01-21 10:47:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-11 11:56:56 +0000
commitafc4431250cfb35dcd6415d1a5c143226c5b8751 (patch)
treee01a726359305eab6050a3e3ae17c671334c3875
parente9c1191da4f84c9743b053e7030ab28b48f57c44 (diff)
downloadpoky-afc4431250cfb35dcd6415d1a5c143226c5b8751.tar.gz
package.bbclass: fix strip and split logic
Marks original commit message and variable documentation state that stripping and splitting are independent of eachother, but package.bbclass ANDs the two INHIBIT flags to see which files can be stripped and/or split. Original behaviour: INHIBIT_PACKAGE_STRIP: no strip, no debug split INHIBIT_PACAKGE_DEBUG_SPLIT: no strip, no debug split Behaviour after this patch: INHIBIT_PACKAGE_STRIP: no strip, no debug split INHIBIT_PACKAGE_DEBUG_SPLIT: strip, no split (From OE-Core rev: 8ea3cc2c45d4e34bb68bd3e0bc359204c772133c) Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 1f73ad6960..b54df60d8f 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -792,8 +792,7 @@ python split_and_strip_files () {
792 kernmods = [] 792 kernmods = []
793 libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir", True)) 793 libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir", True))
794 baselibdir = os.path.abspath(dvar + os.sep + d.getVar("base_libdir", True)) 794 baselibdir = os.path.abspath(dvar + os.sep + d.getVar("base_libdir", True))
795 if (d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT', True) != '1') and \ 795 if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
796 (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
797 for root, dirs, files in cpath.walk(dvar): 796 for root, dirs, files in cpath.walk(dvar):
798 for f in files: 797 for f in files:
799 file = os.path.join(root, f) 798 file = os.path.join(root, f)