From patchwork Mon Nov 25 14:10:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morten Svendsen X-Patchwork-Id: 293997 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 806382C00BA for ; Tue, 26 Nov 2013 01:10:29 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 2100B3FEF4 for ; Mon, 25 Nov 2013 15:10:28 +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 B0E6D3FE64 for ; Mon, 25 Nov 2013 15:10:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=1568; q=dns/txt; s=ironport2; t=1385388626; x=1416924626; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=/oClUiiMM1tpxgPNIkpDWzU8QIs4ILRJHPx8qNSUD00=; b=xo6n2ihvwqZUIndfQGI1k2jFfUGv4kS9kcIleFSNaK5mAGXA9YyAcI8K d1YSkMGXdAvb/X77X6bHhm/adIN4JtSqwD8yZMCsV8UNIV+kIBgJuCk8e jX0DGfWq+UwVJJbOq0/B5ZvmESwTktD5viCUGx8qjucCm/anP7Z8I4t3c A=; X-IronPort-AV: E=Sophos;i="4.93,768,1378850400"; d="scan'208";a="66652" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 25 Nov 2013 15:10:25 +0100 Received: from build1.prevas.dk (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.347.0; Mon, 25 Nov 2013 15:10:26 +0100 From: Morten Thunberg Svendsen To: Subject: [PATCH 2/3] classes/useflags: Remove MACHINE_USE_ for sdk, native, sdk-cross recipes Date: Mon, 25 Nov 2013 14:10:18 +0000 Message-ID: <114bababb9775f2134207e89c6aa20007c4ea354.1385388440.git.morten.thunbergsvendsen@prevas.dk> X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [172.16.10.102] Cc: Morten Thunberg Svendsen 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 MACHINE_USE_ flags must not be used in sdk, native and sdk-cross recipes so delete them before setting the USE_ flags. Fixes bug where EXTRA_ARCH was set to ".${MACHINE}" in useflags.oeclass when a MACHINE_USE flag was set in a sdk-cross recipe. In this case of sdk-cross:gcc and use of MACHINE_USE_toolchain_min_kernel_machine. --- classes/useflags.oeclass | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/classes/useflags.oeclass b/classes/useflags.oeclass index 80bbe05..e26d511 100644 --- a/classes/useflags.oeclass +++ b/classes/useflags.oeclass @@ -53,6 +53,28 @@ def set_useflags(d): BLACKLIST_PREFIX += "LOCAL_USE_ RECIPE_USE_ MACHINE_USE_ DISTRO_USE_ DEFAULT_USE_" +addhook del_useflags to post_recipe_parse first before set_useflags after arch_update + +def del_useflags(d): + import oebakery + useflags = ((d.get('RECIPE_FLAGS') or "").split() + + (d.get('CLASS_FLAGS') or "").split()) + if not useflags: + return + + pkg = d.get("PN") + pkg_type = d.get("PACKAGE_TYPE_" + pkg) or d.get("RECIPE_TYPE") + if not pkg_type in ("native", "sdk", "sdk-cross"): + return + + for useflag in useflags: + machine_val = d.get('MACHINE_USE_'+useflag) + if machine_val is not None: + oebakery.info('Deleting MACHINE_USE_%s variable from %s:%s_%s' + %(useflag,pkg_type,pkg,d.get("PV"))) + d.del_var('MACHINE_USE_'+useflag) + + # Local Variables: # mode: python # End: