From patchwork Tue Jan 21 09:47:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 23428 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 66890218C5 for ; Tue, 21 Jan 2014 09:47:27 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id e14sf31667493iej.0 for ; Tue, 21 Jan 2014 01:47:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=vIINaph3CRRU7KwbrM2culAaPtwUP9NBFHJMsF6Low0=; b=axhdDnT9c9vo9qyyj0CHh4P5QCmSf7JfxRfT/l79EU7kFyxLvJy+G2D7SWpEyUizJd MnAMa+XQnsaxXrWqhZhURrEWMoSScgFPdk4IXzoH/+23WpdxktOWSjjQd2BoHUa8VppP zB1wOCETRgf38ap1kK9xG13MwFd152o5DsNDVNq4++8qMd4rKYI50YDNhdV3bnWcwvzh jwlF5D++RcEqTF75VpJJoNR/vFGwVIWyg7qjhha6+f6J2n25xbXmxTe46D/VjAo3+8dP zR4t/8WUxtP7LZkvnslEnvSjF3iwUKWFTompN2aRyraqT/xXEQE3lPqR/Zq/YqC2maJV xFiQ== X-Gm-Message-State: ALoCoQkzndXu9r56ZFiruvFtL7co3aVUivcZ0K+xUg2ix+VkE12YVYf+kd4Y9VcK1gxlTrJTqqQ/ X-Received: by 10.50.112.10 with SMTP id im10mr7152016igb.2.1390297646672; Tue, 21 Jan 2014 01:47:26 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.107.10 with SMTP id g10ls1171385qgf.50.gmail; Tue, 21 Jan 2014 01:47:26 -0800 (PST) X-Received: by 10.58.208.130 with SMTP id me2mr14099729vec.13.1390297646390; Tue, 21 Jan 2014 01:47:26 -0800 (PST) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id zw4si1688522vec.74.2014.01.21.01.47.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Jan 2014 01:47:26 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id ld13so3337506vcb.4 for ; Tue, 21 Jan 2014 01:47:26 -0800 (PST) X-Received: by 10.220.103.141 with SMTP id k13mr793119vco.25.1390297646318; Tue, 21 Jan 2014 01:47:26 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp106562vcz; Tue, 21 Jan 2014 01:47:25 -0800 (PST) X-Received: by 10.66.159.233 with SMTP id xf9mr8361876pab.139.1390297645397; Tue, 21 Jan 2014 01:47:25 -0800 (PST) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id mj6si4694717pab.159.2014.01.21.01.47.24 for ; Tue, 21 Jan 2014 01:47:25 -0800 (PST) Received-SPF: pass (google.com: domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A53A46157A; Tue, 21 Jan 2014 09:47:22 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by mail.openembedded.org (Postfix) with ESMTP id 6A96160155 for ; Tue, 21 Jan 2014 09:47:21 +0000 (UTC) Received: by mail-wi0-f179.google.com with SMTP id hr1so4118281wib.0 for ; Tue, 21 Jan 2014 01:47:21 -0800 (PST) X-Received: by 10.180.85.6 with SMTP id d6mr13801253wiz.48.1390297641787; Tue, 21 Jan 2014 01:47:21 -0800 (PST) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id q15sm6686517wjw.18.2014.01.21.01.47.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jan 2014 01:47:21 -0800 (PST) From: Koen Kooi To: openembedded-core@lists.openembedded.org Date: Tue, 21 Jan 2014 10:47:12 +0100 Message-Id: <1390297632-9966-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.8.4.2 Cc: Koen Kooi Subject: [OE-core] [RFC][PATCH] package.bbclass: fix strip and split logic X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: koen.kooi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 --- 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 768047c..fa0b7eb 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -781,8 +781,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)