From 56d4f91fe24a3dfa791b5c62a4103a182f500495 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 29 May 2014 00:01:01 -0700 Subject: siteinfo, insane: Recognize musl specific triplets We will use '-musl' to identify musl based systems this patch lays the foundation for recognising those and map them to internal variable representations (From OE-Core rev: 9cd77aed67373e33dc69158ab02b94d7045c1119) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 21 +++++++++++++++++++++ meta/classes/siteinfo.bbclass | 13 +++++++++++++ 2 files changed, 34 insertions(+) (limited to 'meta/classes') diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 9ce336415a..c8fa7116b3 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -98,6 +98,20 @@ def package_qa_get_machine_dict(): "sh4": (42, 0, 0, True, 32), }, + "linux-musl" : { + "arm" : ( 40, 97, 0, True, 32), + "armeb": ( 40, 97, 0, False, 32), + "powerpc": ( 20, 0, 0, False, 32), + "i386": ( 3, 0, 0, True, 32), + "i486": ( 3, 0, 0, True, 32), + "i586": ( 3, 0, 0, True, 32), + "i686": ( 3, 0, 0, True, 32), + "x86_64": ( 62, 0, 0, True, 64), + "mips": ( 8, 0, 0, False, 32), + "mipsel": ( 8, 0, 0, True, 32), + "mips64": ( 8, 0, 0, False, 64), + "mips64el": ( 8, 0, 0, True, 64), + }, "uclinux-uclibc" : { "bfin": ( 106, 0, 0, True, 32), }, @@ -105,6 +119,10 @@ def package_qa_get_machine_dict(): "arm" : (40, 0, 0, True, 32), "armeb" : (40, 0, 0, False, 32), }, + "linux-musleabi" : { + "arm" : (40, 0, 0, True, 32), + "armeb" : (40, 0, 0, False, 32), + }, "linux-uclibceabi" : { "arm" : (40, 0, 0, True, 32), "armeb" : (40, 0, 0, False, 32), @@ -112,6 +130,9 @@ def package_qa_get_machine_dict(): "linux-gnuspe" : { "powerpc": (20, 0, 0, False, 32), }, + "linux-muslspe" : { + "powerpc": (20, 0, 0, False, 32), + }, "linux-uclibcspe" : { "powerpc": (20, 0, 0, False, 32), }, diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index 9ae2561c88..e90632aeef 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -58,6 +58,9 @@ def siteinfo_data(d): "linux-uclibc": "common-linux common-uclibc", "linux-uclibceabi": "common-linux common-uclibc", "linux-uclibcspe": "common-linux common-uclibc", + "linux-musl": "common-linux common-musl", + "linux-musleabi": "common-linux common-musl", + "linux-muslspe": "common-linux common-musl", "uclinux-uclibc": "common-uclibc", "cygwin": "common-cygwin", "mingw32": "common-mingw", @@ -66,21 +69,31 @@ def siteinfo_data(d): "aarch64-linux-gnu": "aarch64-linux", "aarch64_be-linux-gnu": "aarch64_be-linux", "arm-linux-gnueabi": "arm-linux", + "arm-linux-musleabi": "arm-linux", "arm-linux-uclibceabi": "arm-linux-uclibc", "armeb-linux-gnueabi": "armeb-linux", "armeb-linux-uclibceabi": "armeb-linux-uclibc", + "armeb-linux-musleabi": "armeb-linux", + "mips-linux-musl": "mips-linux", + "mipsel-linux-musl": "mipsel-linux", + "mips64-linux-musl": "mips-linux", + "mips64el-linux-musl": "mipsel-linux", "mips64-linux-gnun32": "mips-linux bit-32", "mips64el-linux-gnun32": "mipsel-linux bit-32", "powerpc-linux": "powerpc32-linux", + "powerpc-linux-musl": "powerpc-linux powerpc32-linux", "powerpc-linux-uclibc": "powerpc-linux powerpc32-linux", "powerpc-linux-gnuspe": "powerpc-linux powerpc32-linux", + "powerpc-linux-muslspe": "powerpc-linux powerpc32-linux", "powerpc-linux-uclibcspe": "powerpc-linux powerpc32-linux powerpc-linux-uclibc", "powerpc64-linux-gnuspe": "powerpc-linux powerpc64-linux", + "powerpc64-linux-muslspe": "powerpc-linux powerpc64-linux", "powerpc64-linux": "powerpc-linux", "x86_64-cygwin": "bit-64", "x86_64-darwin": "bit-64", "x86_64-darwin9": "bit-64", "x86_64-linux": "bit-64", + "x86_64-linux-musl": "x86_64-linux bit-64", "x86_64-linux-uclibc": "bit-64", "x86_64-linux-gnu": "bit-64 x86_64-linux", "x86_64-linux-gnux32": "bit-32 ix86-common x32-linux", -- cgit v1.2.3-54-g00ecf