From patchwork Wed Dec 11 07:28:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 299843 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id B73BE2C0307 for ; Wed, 11 Dec 2013 18:29:03 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 7F4EE3FDF2 for ; Wed, 11 Dec 2013 08:28:58 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id 2EADC3FC9E for ; Wed, 11 Dec 2013 08:28:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=1321; q=dns/txt; s=ironport2; t=1386746935; x=1418282935; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=SXG/dWAfdqOa5NR29lzv0M7umgkDOttNqD4ZXh7c31U=; b=pMiLMafEqxvA9fuIGW3uMD3SEk/0ZN0l5ZbB33gHGfnUf7IETkJsRYeC 3zlIAcj0IiVO1+g4CxfnRTvQyRqdZ1f473eoN48w6AW5MeFmXDnqhTEqs pqVjfKVSnbf9rfIkWj5veVA0LOL4UR+NdN4miA/IZOSXKWx6WXac6AryC 8=; X-IronPort-AV: E=Sophos;i="4.93,870,1378850400"; d="scan'208";a="116500" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 11 Dec 2013 08:28:54 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Wed, 11 Dec 2013 08:28:55 +0100 Received: by localhost (Postfix, from userid 30007) id 63F796814D1; Wed, 11 Dec 2013 07:28:55 +0000 (UTC) From: To: Subject: [PATCH 1/1] class/chrpath: Use correct chrpath cmd for all types of recipes Date: Wed, 11 Dec 2013 07:28:53 +0000 Message-ID: X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Christian Sørensen For sdk builds, native:chrpath would be attempted to use if the SDK_CPU were identical to the build CPU. This fix ensures that the correct chrpath cmd is used for all types of recipes. Signed-off-by: Christian Sørensen --- classes/chrpath.oeclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/chrpath.oeclass b/classes/chrpath.oeclass index 42c4a3e..9712c1d 100644 --- a/classes/chrpath.oeclass +++ b/classes/chrpath.oeclass @@ -47,13 +47,13 @@ def do_chrpath(d): filemagic.load() chrpath_cmd = {} - for elf_type in ("BUILD", "HOST", "TARGET"): + for elf_type in ("HOST", "TARGET", "BUILD"): chrpath_cmd[elf_type] = (d.get("%s_ELF"%(elf_type)), d.get("CHRPATH_%s"%(elf_type))) + if chrpath_cmd["TARGET"][0] == chrpath_cmd["BUILD"][0]: + del chrpath_cmd["BUILD"] if chrpath_cmd["TARGET"][0] == chrpath_cmd["HOST"][0]: del chrpath_cmd["TARGET"] - if chrpath_cmd["HOST"][0] == chrpath_cmd["BUILD"][0]: - del chrpath_cmd["HOST"] for elf_type in chrpath_cmd: if not chrpath_cmd[elf_type][0]: del chrpath_cmd[elf_type]