From patchwork Tue Sep 25 13:43:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 147428 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp747720lji; Tue, 25 Sep 2018 06:43:59 -0700 (PDT) X-Google-Smtp-Source: ACcGV61U5HCv4x6sb7g71SFfLxJnE9/c7tvi9D0EWih6isxydwPR5bobfc7NrYrXrS8aUJug3JFc X-Received: by 2002:a17:902:9a45:: with SMTP id x5-v6mr991121plv.213.1537883039049; Tue, 25 Sep 2018 06:43:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537883039; cv=none; d=google.com; s=arc-20160816; b=eLzkCemhMf8AgX74OAfMHq2lQZtlPHhln7kCS90yS4+WoeTyBOPBXyXWCyOsFpdjYQ xXL20S3gSYSYN68jK3c8qfB+VGl3gI/Z+feFId4IkHLxP59bnBWOVrsAR01oYE9LqsIs XaNR4YwdC7MUGPncHwFAKeWDy3fTvp8hQ2WZOoxnFxu0Y06RnHNdp/sqD8b0RcdZnr/l i8V+WBnjcRMZDzqzwIgOLkuegiJGCh3KKRVYsoM4GHuYBTp44LFR0YI86mukrHvoLpUD CeUWyoaNVzs9T+dH9OrKsCYOZw7Zo3IggUO4TBoW63cOVFHh9AAN3DnXp5jJ4yHuGywg +2BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=2mdujth8/X5900oe2Wjcq5hcdxPQr+WU3TDxk3wrScw=; b=dl7MQSYOMLHP39vy7rQpxGsHae15sRx71I5zkM7+WuOvdQEDKMNB5k9ekQ2FrXL/tP IAYQW4P1tb1roSnGfXCJy0/ZXh67hjTMPHjRmaE/n6jRGkPk8uJtGq9lE4Brkqn0NWgZ AkCHi+FjpGhd1+IUA9ObzEC96J/DByvFBE2QZhIz1nHLXNX71M9MwVqjleGuzfBX1FNo ZTE/UOntKHxXKk9rnxQ8oPYanDyxWIrzzK2BcrgQQH6kscz1TjrDcabxlEL3xV0S9azR DeiQK0dSv42ppA3l3gBHHVCU1GuPJGJB+Cpcx2NQannONXSjU28lIOE92GH51MBkGPUC 50QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=IHhOwSXz; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id z1-v6si2444202pgg.641.2018.09.25.06.43.58; Tue, 25 Sep 2018 06:43:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=IHhOwSXz; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7E05C793DC; Tue, 25 Sep 2018 13:43:54 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mail.openembedded.org (Postfix) with ESMTP id 080596FFFE for ; Tue, 25 Sep 2018 13:43:52 +0000 (UTC) Received: by mail-wm1-f42.google.com with SMTP id q8-v6so13722377wmq.4 for ; Tue, 25 Sep 2018 06:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=MvlmzAIOsW6IylwYJvGWCibZ0FOVEq44fjNZ3IXI40c=; b=IHhOwSXz4gnUpxVvkpghgLQyZU8l/or56+FOhBLI4k8SNUlG3NEHpFFlpXButuzi1s N1gkoyaw1iXMhr3XDHQcZ3Zhxj9w3WcaX/PVR4kgwh4GBXJ5FJc4kXNKYkaEGJhOSE4D egbPLA5SUiHsWdjUXVejtPlC8iKElDqBmtuf//TrEJexsBxsjzkB51mnUHQQordgCuT2 ctkjjqye9u18KquEt6eQSjON4wtl9FTX1l7dnRLhsBv3SQR4fIajQ71FWDd5Cv2s2Xrl 0apSddosMOU30HvFauSlyqAxg3fk+AbDw6upEAvSvZCH7trjgNZEqSbQMBYSIDbIk6OX yhxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=MvlmzAIOsW6IylwYJvGWCibZ0FOVEq44fjNZ3IXI40c=; b=CC+io1RGg+fm0xkIWlAE+c3SuxDFK7RfmyR4xIsG8k8KFwEwXdLReu3Xzl28S/gbOG LfyPD2mSgclmIgbsGOfHRj4zMcw0f0wEScTVqQYpkRfhIHwnYpeFuBcDz8X9ug0/+kY4 /kVa+Dnv5slkMK8/jNQfOsOefD+42+N/l7EUiXPTomSeROyOyN5Sj3anUygO9l9CxRPs kldEi4KqjtmAizqfJCBqUVJmWB0Wd6fLxKQvyRiPqTneCHMJRKe+xGeL+FtvdQQJclmx JSTQ+SxLmrnhLNKxi/edxR9rwJalvx6oZk/BiCjVcuOV9PheOrnct9qqaiQ3qc/IPg2B LyLw== X-Gm-Message-State: ABuFfohl7QlPWHqOE82z+6ynKu6ldMe+px1Yy2pdiiV80JxMOo4JkSfg zUUiyPjhwFSNEjofFPYbfHiMZ7DlIpM= X-Received: by 2002:a1c:2d54:: with SMTP id t81-v6mr783001wmt.31.1537883032938; Tue, 25 Sep 2018 06:43:52 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b21-v6sm1852340wmj.28.2018.09.25.06.43.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 06:43:51 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 25 Sep 2018 14:43:43 +0100 Message-Id: <20180925134348.5562-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/6] siteinfo: generalise siteinfo X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer 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 Signed-off-by: Ross Burton --- meta/classes/siteinfo.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index 4698e6e474d..e80835605fb 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -15,7 +15,7 @@ # It is an error for the target not to exist. # If 'what' doesn't exist then an empty value is returned # -def siteinfo_data(d): +def siteinfo_data_for_machine(hostarch, hostos, d): archinfo = { "allarch": "endian-little bit-32", # bogus, but better than special-casing the checks below for allarch "aarch64": "endian-little bit-64 arm-common arm-64", @@ -131,8 +131,6 @@ def siteinfo_data(d): locs = { "archinfo" : archinfo, "osinfo" : osinfo, "targetinfo" : targetinfo, "d" : d} archinfo, osinfo, targetinfo = bb.utils.better_eval(call, locs) - hostarch = d.getVar("HOST_ARCH") - hostos = d.getVar("HOST_OS") target = "%s-%s" % (hostarch, hostos) sitedata = [] @@ -148,6 +146,9 @@ def siteinfo_data(d): bb.debug(1, "SITE files %s" % sitedata); return sitedata +def siteinfo_data(d): + return siteinfo_data_for_machine(d.getVar("HOST_ARCH"), d.getVar("HOST_OS"), d) + python () { sitedata = set(siteinfo_data(d)) if "endian-little" in sitedata: