3 files changed, 225 insertions, 0 deletions

diff --git a/meta-linaro-toolchain/conf/distro/include/external-linaro-toolchain-versions.inc b/meta-linaro-toolchain/conf/distro/include/external-linaro-toolchain-versions.inc
new file mode 100644
index 0000000..6165520
--- /dev/null
+++ b/meta-linaro-toolchain/conf/distro/include/external-linaro-toolchain-versions.inc
@@ -0,0 +1,111 @@
+def elt_run(d, cmd, *args):
+        import bb.process
+        import subprocess
+
+        topdir = d.getVar('TOPDIR', True)
+        toolchain_path = d.getVar('EXTERNAL_TOOLCHAIN', True)
+        if not toolchain_path:
+                return 'UNKNOWN', 'UNKNOWN'
+
+        target_prefix = d.getVar('TARGET_PREFIX', True)
+        path = os.path.join(toolchain_path, 'bin', target_prefix + cmd)
+        args = [path] + list(args)
+
+        return bb.process.run(args, cwd=topdir, stderr=subprocess.PIPE)
+
+def elt_get_version(d):
+        try:
+                stdout, stderr = elt_run(d, 'gcc', '-v')
+        except bb.process.CmdError as exc:
+                bb.error('Failed to obtain external Linaro toolchain version: %s' % exc)
+                return 'UNKNOWN'
+        else:
+                last_line = stderr.splitlines()[-1]
+                return last_line
+
+def elt_get_main_version(d):
+        version = elt_get_version(d)
+        if version != 'UNKNOWN':
+                if version.split()[5] != '(crosstool-NG':
+                        return version.split()[7].split(')')[0]
+                else:
+                        return version.split()[6].split('-')[3]
+        else:
+                return version
+
+def elt_get_gcc_version(d):
+        version = elt_get_version(d)
+        if version != 'UNKNOWN':
+                return version.split()[2]
+        else:
+                return version
+
+def elt_get_libc_version(d):
+        import os,bb
+        syspath = bb.data.expand('${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}', d)
+        if not syspath:
+                return 'UNKNOWN'
+
+        libpath = syspath + '/libc/lib/' + bb.data.expand('${ELT_TARGET_SYS}/', d)
+
+        if os.path.exists(libpath):
+                for file in os.listdir(libpath):
+                        if file.find('libc-') == 0:
+                                return file[5:-3]
+
+        libpath = syspath + '/libc/lib/'
+
+        if os.path.exists(libpath):
+                for file in os.listdir(libpath):
+                        if file.find('libc-') == 0:
+                                return file[5:-3]
+        return 'UNKNOWN'
+
+def elt_get_kernel_version(d):
+        import os,bb
+        syspath = bb.data.expand('${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}', d)
+        if not syspath:
+                return 'UNKNOWN'
+
+        vf = syspath + '/libc/usr/include/linux/version.h'
+
+        try:
+                f = open(vf, 'r')
+        except (OSError, IOError):
+                return 'UNKNOWN'
+
+        l = f.readlines();
+        f.close();
+        for s in l:
+                if s.find('LINUX_VERSION_CODE') > 0:
+                        ver = int(s.split()[2])
+                        maj = ver / 65536
+                        ver = ver % 65536
+                        min = ver / 256
+                        ver = ver % 256
+                        return str(maj)+'.'+str(min)+'.'+str(ver)
+        return 'UNKNOWN'
+
+def elt_get_gdb_version(d):
+        try:
+                stdout, stderr = elt_run(d, 'gdb', '-v')
+        except bb.process.CmdError:
+                return 'UNKNOWN'
+        else:
+                first_line = stdout.splitlines()[0]
+                return first_line.split()[-1]
+
+python external_linaro_toolchain_version_handler () {
+        if not isinstance(e, bb.event.ConfigParsed):
+                return
+        d = e.data
+        ld = d.createCopy()
+        ld.finalize()
+
+        d.setVar('ELT_VER_MAIN', elt_get_main_version(ld))
+        d.setVar('ELT_VER_GCC', elt_get_gcc_version(ld))
+        d.setVar('ELT_VER_LIBC', elt_get_libc_version(ld))
+        d.setVar('ELT_VER_KERNEL', elt_get_kernel_version(ld))
+        d.setVar('ELT_VER_GDB', elt_get_gdb_version(ld))
+}
+addhandler external_linaro_toolchain_version_handler
diff --git a/meta-linaro-toolchain/conf/distro/include/tcmode-external-linaro.inc b/meta-linaro-toolchain/conf/distro/include/tcmode-external-linaro.inc
new file mode 100644
index 0000000..19be8af
--- /dev/null
+++ b/meta-linaro-toolchain/conf/distro/include/tcmode-external-linaro.inc
@@ -0,0 +1,101 @@
+#
+# Configuration to use an external Linaro binary toolchain
+#
+
+EXTERNAL_TOOLCHAIN ?= "/usr/local/linaro-binary-toolchain/${TARGET_ARCH}"
+
+TOOLCHAIN_PATH_ADD = "${EXTERNAL_TOOLCHAIN}/bin:"
+PATH =. "${TOOLCHAIN_PATH_ADD}"
+
+ELT_TARGET_SYS_arm ?= "arm-linux-gnueabihf"
+ELT_TARGET_SYS_aarch64 ?= "aarch64-linux-gnu"
+ELT_TARGET_SYS = "${TARGET_SYS}"
+TARGET_PREFIX = "${ELT_TARGET_SYS}-"
+
+GCCMULTILIB_forcevariable = "--disable-multilib"
+IMAGE_LINGUAS_forcevariable = ""
+
+PREFERRED_PROVIDER_linux-libc-headers = "external-linaro-toolchain"
+PREFERRED_PROVIDER_linux-libc-headers-dev = "external-linaro-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-linaro-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-linaro-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-linaro-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-linaro-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-linaro-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-linaro-toolchain"
+PREFERRED_PROVIDER_glibc = "external-linaro-toolchain"
+PREFERRED_PROVIDER_libgcc = "external-linaro-toolchain"
+PREFERRED_PROVIDER_virtual/libc = "external-linaro-toolchain"
+PREFERRED_PROVIDER_virtual/libintl = "external-linaro-toolchain"
+PREFERRED_PROVIDER_virtual/libiconv = "external-linaro-toolchain"
+PREFERRED_PROVIDER_glibc-thread-db = "external-linaro-toolchain"
+PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-linaro-toolchain"
+
+TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/include "
+TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/lib "
+
+TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}"
+
+DISTRO_FEATURES_LIBC = "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-crypt \
+                        libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \
+                        libc-getlogin libc-idn libc-inet-anl libc-libm libc-libm-big \
+                        libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \
+                        libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
+                        libc-posix-wchar-io"
+
+ENABLE_BINARY_LOCALE_GENERATION = "0"
+GLIBC_INTERNAL_USE_BINARY_LOCALE = "precompiled"
+
+ERROR_QA[type] ?= "list"
+python toolchain_metadata_setup () {
+    import subprocess
+    if not isinstance(e, bb.event.ConfigParsed):
+        return
+
+    d = e.data
+    l = d.createCopy()
+    l.finalize()
+    oe_import(l)
+
+    external_toolchain = l.getVar('EXTERNAL_TOOLCHAIN', True)
+    if not external_toolchain or external_toolchain == 'UNDEFINED':
+        bb.fatal("Error: EXTERNAL_TOOLCHAIN must be set to the path to your linaro toolchain")
+
+    if not os.path.exists(external_toolchain):
+        bb.fatal("Error: EXTERNAL_TOOLCHAIN path '%s' does not exist" % external_toolchain)
+
+    # The external toolchain may not have been built with the oe-core preferred
+    # gnu hash setting, so ensure that the corresponding sanity check is not an error.
+    error_qa = oe.data.typed_value('ERROR_QA', l)
+    if 'ldflags' in error_qa:
+        error_qa.remove('ldflags')
+        d.setVar('ERROR_QA', ' '.join(error_qa))
+}
+addhandler toolchain_metadata_setup
+
+def populate_toolchain_links(d):
+    import errno
+    import os
+    from glob import glob
+
+    d = d.createCopy()
+    d.finalize()
+
+    pattern = bb.data.expand('${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}*', d)
+    files = glob(pattern)
+    if not files:
+        bb.fatal("Unable to populate toolchain binary symlinks")
+
+    bindir = d.getVar('STAGING_BINDIR_TOOLCHAIN', True)
+    bb.mkdirhier(bindir)
+    for f in files:
+        base = os.path.basename(f)
+        newpath = os.path.join(bindir, base)
+        try:
+            os.symlink(f, newpath)
+        except OSError as exc:
+            if exc.errno == errno.EEXIST:
+                break
+            bb.fatal("Unable to populate toolchain binary symlink for %s: %s" % (newpath, exc))
+
+require conf/distro/include/external-linaro-toolchain-versions.inc
diff --git a/meta-linaro-toolchain/conf/layer.conf b/meta-linaro-toolchain/conf/layer.conf
new file mode 100644
index 0000000..7e96dcd
--- /dev/null
+++ b/meta-linaro-toolchain/conf/layer.conf
@@ -0,0 +1,13 @@
+BBPATH .= ":${LAYERDIR}"
+BBFILES += "\
+            ${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend \
+           "
+
+BBFILE_COLLECTIONS += "linaro-toolchain"
+BBFILE_PATTERN_linaro-toolchain := "^${LAYERDIR}/"
+BBFILE_PRIORITY_linaro-toolchain = "30"
+
+# do not error out on bbappends for missing recipes
+BB_DANGLINGAPPENDS_WARNONLY = "true"
+