[oe-commits] Koen Kooi : package.bbclass: fix strip and split logic

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 89087d122f35e1ab5d91c788e671bdf3be56aa16
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=89087d122f35e1ab5d91c788e671bdf3be56aa16

Author: Koen Kooi <koen.kooi at linaro.org>
Date:   Tue Jan 21 10:47:12 2014 +0100

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

Signed-off-by: Koen Kooi <koen.kooi at linaro.org>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/package.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 70f9aaa..eabfe1d 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -792,8 +792,7 @@ python split_and_strip_files () {
     kernmods = []
     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_DEBUG_SPLIT', True) != '1') and \
-            (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
+    if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
         for root, dirs, files in cpath.walk(dvar):
             for f in files:
                 file = os.path.join(root, f)