diff options
| author | Koen Kooi <koen.kooi@linaro.org> | 2016-02-18 12:09:01 +0100 |
|---|---|---|
| committer | Koen Kooi <koen.kooi@linaro.org> | 2016-02-18 12:09:25 +0100 |
| commit | ea9eb2bdfe9558db3d272da83a44582f26b83cb7 (patch) | |
| tree | 2125f91491b36964f519c439fc1938261755454b | |
| parent | 021a8d66e620073de282381b57f6e048e60e8af5 (diff) | |
siteinfo bbclass: sync with OE-core
Change-Id: If137d4b6418caa2af1480351488ddc76543c45dd
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
| -rw-r--r-- | meta-ilp32/classes/siteinfo.bbclass | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/meta-ilp32/classes/siteinfo.bbclass b/meta-ilp32/classes/siteinfo.bbclass index 2cea0b59..e2df9d4a 100644 --- a/meta-ilp32/classes/siteinfo.bbclass +++ b/meta-ilp32/classes/siteinfo.bbclass @@ -8,7 +8,7 @@ # # 'what' can be one of # * target: Returns the target name ("<arch>-<os>") -# * endianess: Return "be" for big endian targets, "le" for little endian +# * endianness: Return "be" for big endian targets, "le" for little endian # * bits: Returns the bit size of the target, either "32" or "64" # * libc: Returns the name of the c library used by the target # @@ -24,12 +24,14 @@ def siteinfo_data(d): "armeb": "endian-big bit-32 arm-common arm-32", "avr32": "endian-big bit-32 avr32-common", "bfin": "endian-little bit-32 bfin-common", + "epiphany": "endian-little bit-32", "i386": "endian-little bit-32 ix86-common", "i486": "endian-little bit-32 ix86-common", "i586": "endian-little bit-32 ix86-common", "i686": "endian-little bit-32 ix86-common", "ia64": "endian-little bit-64", "microblaze": "endian-big bit-32 microblaze-common", + "microblazeeb": "endian-big bit-32 microblaze-common", "microblazeel": "endian-little bit-32 microblaze-common", "mips": "endian-big bit-32 mips-common", "mips64": "endian-big bit-64 mips-common", @@ -100,6 +102,7 @@ def siteinfo_data(d): "x86_64-linux": "bit-64", "x86_64-linux-musl": "x86_64-linux bit-64", "x86_64-linux-uclibc": "bit-64", + "x86_64-elf": "bit-64", "x86_64-linux-gnu": "bit-64 x86_64-linux", "x86_64-linux-gnux32": "bit-32 ix86-common x32-linux", "x86_64-mingw32": "bit-64", @@ -155,9 +158,13 @@ def siteinfo_get_files(d, no_cache = False): if no_cache: return sitefiles # Now check for siteconfig cache files - path_siteconfig = d.getVar('SITECONFIG_SYSROOTCACHE', True) - if os.path.isdir(path_siteconfig): + # Use the files copied to the aclocal cache generated by autotools.bbclass + # to avoid races + path_siteconfig = d.getVar('ACLOCALDIR', True) + if path_siteconfig and os.path.isdir(path_siteconfig): for i in os.listdir(path_siteconfig): + if not i.endswith("_config"): + continue filename = os.path.join(path_siteconfig, i) sitefiles += filename + " " |