From 7429ed8d2a6e48cb3415113ef62348ae211aa189 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 25 Sep 2018 14:46:16 +0100 Subject: siteinfo: generalise siteinfo Add a function siteinfo_data_for_machine to look up the data for any arch/os pair, not just HOST_ARCH-HOST_OS. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/siteinfo.bbclass | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'meta') diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index 4698e6e474..24585d5842 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(arch, os, 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,15 +131,13 @@ 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) + target = "%s-%s" % (arch, os) sitedata = [] - if hostarch in archinfo: - sitedata.extend(archinfo[hostarch].split()) - if hostos in osinfo: - sitedata.extend(osinfo[hostos].split()) + if arch in archinfo: + sitedata.extend(archinfo[arch].split()) + if os in osinfo: + sitedata.extend(osinfo[os].split()) if target in targetinfo: sitedata.extend(targetinfo[target].split()) sitedata.append(target) @@ -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: -- cgit 1.2.3-korg