From 0fc798640ba60cbb9074d617ba18518b113b7186 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 22 Jul 2011 18:59:48 -0700 Subject: siteinfo: Rework the siteinfo for powerpc to fix uclibc fallout I believe that powerpc-linux is now a common file across 32bit/64bit linux for powerpc be it uclibc or glibc. I compared the differences between powerpc-linux-uclibc and powerpc-linux files and it powerpc-linux was more uptodate and all the new stuff it had was needed for uclibc anyway so we do not need to keep exact copy of powerpc-linux as powerpc-linux-uclibc instead we use powerpc-linux for powerpc/uclibc targets. Secondly linux specific files were added in archinfo dictionary which I think logically belongs to targetinfo dictionary therefore moved them to targetinfo now uclibc/powerpc is buildable again Signed-off-by: Khem Raj --- meta/classes/siteinfo.bbclass | 16 ++++++++++------ meta/site/powerpc-linux-uclibc | 0 2 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 meta/site/powerpc-linux-uclibc diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index f3c24e88f..9dacd58d1 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -33,11 +33,11 @@ def siteinfo_data(d): "mips64": "endian-big bit-64 mips64-common", "mips64el": "endian-little bit-64 mips64-common", "mipsel": "endian-little bit-32 mips-common", - "powerpc": "endian-big bit-32 powerpc-common powerpc32-linux", + "powerpc": "endian-big bit-32 powerpc-common", "nios2": "endian-little bit-32 nios2-common", - "powerpc64": "endian-big bit-64 powerpc-common powerpc-linux powerpc64-linux", - "ppc": "endian-big bit-32 powerpc-common powerpc32-linux", - "ppc64": "endian-big bit-64 powerpc-common powerpc-linux powerpc64-linux", + "powerpc64": "endian-big bit-64 powerpc-common", + "ppc": "endian-big bit-32 powerpc-common", + "ppc64": "endian-big bit-64 powerpc-common", "sh3": "endian-little bit-32 sh-common", "sh4": "endian-little bit-32 sh-common", "sparc": "endian-big bit-32", @@ -62,8 +62,12 @@ def siteinfo_data(d): "arm-linux-uclibceabi": "arm-linux-uclibc", "armeb-linux-gnueabi": "armeb-linux", "armeb-linux-uclibceabi": "armeb-linux-uclibc", - "powerpc-linux-gnuspe": "powerpc-linux", - "powerpc-linux-uclibcspe": "powerpc-linux-uclibc", + "powerpc-linux": "powerpc32-linux", + "powerpc-linux-uclibc": "powerpc-linux powerpc32-linux", + "powerpc-linux-gnuspe": "powerpc-linux powerpc32-linux", + "powerpc-linux-uclibcspe": "powerpc-linux powerpc32-linux powerpc-linux-uclibc", + "powerpc64-linux-gnuspe": "powerpc-linux powerpc64-linux", + "powerpc64-linux": "powerpc-linux", } hostarch = d.getVar("HOST_ARCH", True) diff --git a/meta/site/powerpc-linux-uclibc b/meta/site/powerpc-linux-uclibc deleted file mode 100644 index e69de29bb..000000000 -- cgit v1.2.3