From 2f1f8a9f245a540a769e00e43263894836e87142 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 21 Jan 2014 10:47:12 +0100 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- 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 1f73ad6..b54df60 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) -- 2.7.4