A couple of removals
v2 cover A couple of removals
Since v1, extended the external-sourcery-toolchain change to update documentation.conf and local.conf.sample.extended to match up with the change.
The following changes since commit 8505f0fa48cc79d51616b923c6e2c778c4b46a44:
libmatchbox: use PACKAGECONFIG (2013-12-10 14:13:01 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/cleanup2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/cleanup2
Paul Eggleton (2):
classes/module_strip: remove
external-sourcery-toolchain: remove
meta/classes/kernel.bbclass | 2 +- meta/classes/module-base.bbclass | 2 - meta/classes/module_strip.bbclass | 0 meta/conf/distro/include/csl-versions.inc | 107 --------- meta/conf/distro/include/tcmode-external-csl.inc | 2 - .../distro/include/tcmode-external-sourcery.inc | 128 ---------- meta/conf/documentation.conf | 2 +- meta/conf/local.conf.sample.extended | 20 +- .../meta/external-sourcery-toolchain.bb | 149 ------------ .../meta/external-sourcery-toolchain/SUPPORTED | 257 --------------------- 10 files changed, 17 insertions(+), 652 deletions(-) delete mode 100644 meta/classes/module_strip.bbclass delete mode 100644 meta/conf/distro/include/csl-versions.inc delete mode 100644 meta/conf/distro/include/tcmode-external-csl.inc delete mode 100644 meta/conf/distro/include/tcmode-external-sourcery.inc delete mode 100644 meta/recipes-core/meta/external-sourcery-toolchain.bb delete mode 100644 meta/recipes-core/meta/external-sourcery-toolchain/SUPPORTED
Signature · 1 line
1.8.1.2
PATCH v2 1/2 classes/module_strip: remove
This class has been empty since 2010, so we shouldn't need it anymore. A check of common layers suggests there shouldn't be any references to it outside of OE-Core.
--- meta/classes/kernel.bbclass | 2 +- meta/classes/module-base.bbclass | 2 -- meta/classes/module_strip.bbclass | 0 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 meta/classes/module_strip.bbclass
meta/classes/kernel.bbclass +1 -1
@@ -1,4 +1,4 @@ -inherit linux-kernel-base module_strip kernel-module-split +inherit linux-kernel-base kernel-module-split PROVIDES += "virtual/kernel" DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native depmodwrapper-cross"
meta/classes/module-base.bbclass +0 -2
@@ -1,5 +1,3 @@ -inherit module_strip - inherit kernel-arch export OS = "${TARGET_OS}"
meta/classes/module_strip.bbclass deleted +0 -0
Signature · 1 line
1.8.1.2
PATCH v2 2/2 external-sourcery-toolchain: remove
In reply to Paul EggletonAs per discussion on the mailing list [1], remove this largely unmaintained external toolchain support in favour of the maintained version in meta-sourcery [2].
Also correct the example and documentation.conf entries for TCMODE to match up with this change.
[1] http://lists.openembedded.org/pipermail/openembedded-core/2013-December/087133.html
[2] https://github.com/MentorEmbedded/meta-sourcery/
--- meta/conf/distro/include/csl-versions.inc | 107 --------- meta/conf/distro/include/tcmode-external-csl.inc | 2 - .../distro/include/tcmode-external-sourcery.inc | 128 ---------- meta/conf/documentation.conf | 2 +- meta/conf/local.conf.sample.extended | 20 +- .../meta/external-sourcery-toolchain.bb | 149 ------------ .../meta/external-sourcery-toolchain/SUPPORTED | 257 --------------------- 7 files changed, 16 insertions(+), 649 deletions(-) delete mode 100644 meta/conf/distro/include/csl-versions.inc delete mode 100644 meta/conf/distro/include/tcmode-external-csl.inc delete mode 100644 meta/conf/distro/include/tcmode-external-sourcery.inc delete mode 100644 meta/recipes-core/meta/external-sourcery-toolchain.bb delete mode 100644 meta/recipes-core/meta/external-sourcery-toolchain/SUPPORTED
meta/conf/distro/include/csl-versions.inc deleted +0 -107
@@ -1,107 +0,0 @@ -def csl_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 csl_get_version(d): - try: - stdout, stderr = csl_run(d, 'gcc', '-v') - except bb.process.CmdError as exc: - bb.error('Failed to obtain CodeSourcery toolchain version: %s' % exc) - bb.error('Make sure that MACHINE is set correctly in your local.conf and the toolchain supports %s.' % d.getVar("TARGET_ARCH", True)) - return 'UNKNOWN' - else: - last_line = stderr.splitlines()[-1] - return last_line - -def csl_get_main_version(d): - version = csl_get_version(d) - if version != 'UNKNOWN': - return version.split()[-1].rstrip(')') - else: - return version - -def csl_get_gcc_version(d): - version = csl_get_version(d) - if version != 'UNKNOWN': - return version.split()[2] - else: - return version - -def csl_get_libc_version(d): - syspath = d.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}') - if not syspath: - return 'UNKNOWN' - - libpath = syspath + '/libc/lib/' - if not os.path.exists(libpath): - libpath = syspath + '/libc/sgxx-glibc/lib/' - - if os.path.exists(libpath): - for file in os.listdir(libpath): - if file.find('libc-') == 0: - return file[5:-3] - return 'UNKNOWN' - -def csl_get_kernel_version(d): - syspath = d.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}') - if not syspath: - return 'UNKNOWN' - - vf = syspath + '/libc/usr/include/linux/version.h' - if not os.path.exists(vf): - vf = syspath + '/libc/sgxx-glibc/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 csl_get_gdb_version(d): - try: - stdout, stderr = csl_run(d, 'gdb', '-v') - except bb.process.CmdError: - return 'UNKNOWN' - else: - first_line = stdout.splitlines()[0] - return first_line.split()[-1] - -python csl_version_handler () { - d = e.data - ld = d.createCopy() - ld.finalize() - - d.setVar('CSL_VER_MAIN', csl_get_main_version(ld)) - d.setVar('CSL_VER_GCC', csl_get_gcc_version(ld)) - d.setVar('CSL_VER_LIBC', csl_get_libc_version(ld)) - d.setVar('CSL_VER_KERNEL', csl_get_kernel_version(ld)) - d.setVar('CSL_VER_GDB', csl_get_gdb_version(ld)) -} -addhandler csl_version_handler -csl_version_handler[eventmask] = "bb.event.ConfigParsed" - -# Ensure that any variable which includes the --sysroot (CC, CXX, etc) also -# depends on the toolchain version -TOOLCHAIN_OPTIONS[vardeps] += "CSL_VER_MAIN CSL_VER_GCC"
meta/conf/distro/include/tcmode-external-csl.inc deleted +0 -2
@@ -1,2 +0,0 @@ -TCMODE = "external-sourcery" -require conf/distro/include/tcmode-${TCMODE}.inc
meta/conf/distro/include/tcmode-external-sourcery.inc deleted +0 -128
128 lines not on this page · raw message
meta/conf/documentation.conf +1 -1
@@ -260,7 +260,7 @@ TARGET_OS[doc] = "Specifies the target's operating system." TARGET_PREFIX[doc] = "The prefix for the cross compile toolchain. E.g arm-linux- ." TARGET_SYS[doc] = "The target system is composed out of TARGET_ARCH,TARGET_VENDOR and TARGET_OS." TCLIBC[doc] = "Specifies which variant of the GNU standard C library (libc) to use during the build process. You can select eglibc or uclibc." -TCMODE[doc] = "The toolchain selector. It selects the external toolchain built using the OpenEmbedded build system or a few supported combinations of the upstream GCC or CodeSourcery Labs toolchain." +TCMODE[doc] = "Enables an external toolchain (where provided by an additional layer) if set to a value other than 'default'." TEST_IMAGE[doc] = "Enable test booting of virtual machine images under the qemu emulator after any root filesystems are created and run tests against those images." TIME[doc] = "The time the build was started HMS" TMPDIR[doc] = "This variable is the temporary directory the OpenEmbedded build system uses when it does its work building images. By default, the TMPDIR variable is named tmp within the Build Directory."
meta/conf/local.conf.sample.extended +15 -5
@@ -78,11 +78,21 @@ # TCMODE controls the characteristics of the generated packages/images by # telling poky which toolchain 'profile' to use. # -# The default is "default" -# Use "external-MODE" to use the precompiled external toolchains where MODE -# is the type of external toolchain to use e.g. eabi. You need to ensure -# the toolchain you want to use is included in an appropriate layer -# TCMODE ?= "external-eabi" +# The default is "default" which uses the internal toolchain. With +# additional layers, it is possible to set this to use a precompiled +# external toolchain. One example is the Sourcery G++ Toolchain, support +# for which is now in the separate meta-sourcery layer: +# +# http://github.com/MentorEmbedded/meta-sourcery/ +# +# meta-sourcery can be used as a template for adding support for other +# external toolchains. See the link above for further details. +# +# TCMODE points the system to a file in conf/distro/include/tcmode-${TCMODE}.inc, +# so for meta-sourcery which has conf/distro/include/tcmode-external-sourcery.inc +# you would set it as follows: +# +# TCMODE ?= "external-sourcery" # mklibs library size optimization is more useful to smaller images, # and less useful for bigger images. Also mklibs library optimization
meta/recipes-core/meta/external-sourcery-toolchain.bb deleted +0 -149
149 lines not on this page · raw message
meta/recipes-core/meta/external-sourcery-toolchain/SUPPORTED deleted +0 -257
257 lines not on this page · raw message
Signature · 1 line
1.8.1.2