From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pb0-f47.google.com ([209.85.160.47]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SWbsv-0002bt-Tz for openembedded-core@lists.openembedded.org; Tue, 22 May 2012 01:19:30 +0200 Received: by pbbrq2 with SMTP id rq2so6645122pbb.6 for ; Mon, 21 May 2012 16:09:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; bh=nEKzbefxXTzLFIhGD9WeAENorqG6MTFDqlcPiF0g3x8=; b=ua63uBdi0H6wr68ml29VuJKGq+7oFn5W7QsCH58Ox9NQRs/9eu/EBQn4x4RIJwvid8 5h3sJ88ME1O9SxKJqNM6F1ilrnVYrWrNs3vbjggTHWXXmR/xENr0r3PYprd+c3m31XnJ 9YTgNPOul/wWSxeZGu+Uwz+cCI4fGq2ef76HrpO9Bp/cDNfI8lBJTX8hztXZINO14kCc R83kNOQBj/kMF/3vDPuiRc308boePBobSaHMCQvUM463yYH8s+UZxp4CmgVSB7VwSfQn 4DtCUnpFFz1XR+20vflFPhDwzbZAIvS4zM+YUkPVU0SzzOI57CVhnhmNe3+SOmZPTT93 u8qg== Received: by 10.68.227.197 with SMTP id sc5mr16174546pbc.58.1337641760998; Mon, 21 May 2012 16:09:20 -0700 (PDT) Received: from localhost.localdomain (ip68-110-79-242.ph.ph.cox.net. [68.110.79.242]) by mx.google.com with ESMTPS id po10sm12643702pbb.21.2012.05.21.16.09.19 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 21 May 2012 16:09:20 -0700 (PDT) From: Christopher Larson To: openembedded-core@lists.openembedded.org Date: Mon, 21 May 2012 16:09:11 -0700 Message-Id: <1337641752-1521-2-git-send-email-kergoth@gmail.com> X-Mailer: git-send-email 1.7.10.2 In-Reply-To: <1337641752-1521-1-git-send-email-kergoth@gmail.com> References: <1337641752-1521-1-git-send-email-kergoth@gmail.com> Subject: [PATCH 2/3] Rename 'external-csl' to 'external-sourcery' X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 May 2012 23:19:30 -0000 This is a rename per the purchase of CodeSourcery by Mentor Graphics Corporation, and associated naming change. Signed-off-by: Christopher Larson --- meta/conf/distro/include/tcmode-external-csl.inc | 120 +------------------- ...ternal-csl.inc => tcmode-external-sourcery.inc} | 34 +++--- ...toolchain.bb => external-sourcery-toolchain.bb} | 0 .../SUPPORTED | 0 4 files changed, 19 insertions(+), 135 deletions(-) copy meta/conf/distro/include/{tcmode-external-csl.inc => tcmode-external-sourcery.inc} (77%) rename meta/recipes-core/meta/{external-csl-toolchain.bb => external-sourcery-toolchain.bb} (100%) rename meta/recipes-core/meta/{external-csl-toolchain => external-sourcery-toolchain}/SUPPORTED (100%) diff --git a/meta/conf/distro/include/tcmode-external-csl.inc b/meta/conf/distro/include/tcmode-external-csl.inc index 0fa2ee1..9e530ab 100644 --- a/meta/conf/distro/include/tcmode-external-csl.inc +++ b/meta/conf/distro/include/tcmode-external-csl.inc @@ -1,118 +1,2 @@ -# -# Configuration to use external CSL toolchain -# - -EXTERNAL_TOOLCHAIN ?= "/usr/local/csl/${TARGET_ARCH}" - -TOOLCHAIN_PATH_ADD = "${EXTERNAL_TOOLCHAIN}/bin:" -PATH =. "${TOOLCHAIN_PATH_ADD}" - -CSL_TARGET_SYS_powerpc ?= "powerpc-linux-gnu" -CSL_TARGET_SYS_powerpc64 ?= "powerpc-linux-gnu" -CSL_TARGET_SYS_arm ?= "arm-none-linux-gnueabi" -CSL_TARGET_SYS_mips ?= "mips-linux-gnu" -CSL_TARGET_SYS_mipsel ?= "mips-linux-gnu" -CSL_TARGET_SYS_mips64 ?= "mips-linux-gnu" -CSL_TARGET_SYS_i686 ?= "i686-pc-linux-gnu" -CSL_TARGET_SYS_i586 ?= "i686-pc-linux-gnu" -CSL_TARGET_SYS = "${TARGET_SYS}" - -TARGET_PREFIX = "${CSL_TARGET_SYS}-" - -PREFERRED_PROVIDER_linux-libc-headers = "external-csl-toolchain" -PREFERRED_PROVIDER_linux-libc-headers-dev = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-csl-toolchain" -PREFERRED_PROVIDER_libgcc = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/libc = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/libintl = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/libiconv = "external-csl-toolchain" -PREFERRED_PROVIDER_glibc-thread-db = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-csl-toolchain" -PREFERRED_PROVIDER_gdbserver ??= "external-csl-toolchain" - -# No need to re-compile the locale files -GLIBC_INTERNAL_USE_BINARY_LOCALE = "precompiled" -ENABLE_BINARY_LOCALE_GENERATION = "" - -TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}" - -# Translate to CodeSourcery's names for their optimized files in the toolchain -def csl_target_core(d): - coredata = { - 'armv7a-vfp-neon': 'armv7-a-neon', - 'i586': 'sgxx-glibc', - 'i686': 'sgxx-glibc', - 'core2': 'sgxx-glibc', - 'mips': 'mips32', - 'mipsel': 'el', - 'powerpc-nf': 'nof', - 'ppce500': 'te500v1', - 'ppce500mc': 'te500mc', - 'ppce500v2': 'te500v2', - 'ppce600': 'te600' - } - return coredata.get(d.getVar('TUNE_PKGARCH', True), '') - -CSL_TARGET_CORE ?= "${@csl_target_core(d)}" - -# Unfortunately, the CSL ia32 toolchain has non-prefixed binaries in its -# bindir (e.g. gcc, ld). To avoid this messing up our build, we avoid adding -# this bindir to our PATH, and instead add symlinks to the prefixed binaries -# to our staging toolchain bindir. - -python toolchain_metadata_setup () { - if not isinstance(e, bb.event.ConfigParsed): - return - - d = e.data - - l = d.createCopy() - l.finalize() - if os.path.exists(bb.data.expand('${EXTERNAL_TOOLCHAIN}/bin/gcc', l)): - d.setVar('TOOLCHAIN_PATH_ADD', '') -} -addhandler toolchain_metadata_setup - -python toolchain_setup () { - if not isinstance(e, bb.event.BuildStarted): - return - - d = e.data - - if not d.getVar('TOOLCHAIN_PATH_ADD', True): - populate_toolchain_links(d) -} -addhandler toolchain_setup - -def populate_toolchain_links(d): - import errno - import os - from glob import glob - - d = d.createCopy() - d.finalize() - - pattern = d.expand('${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}*') - files = glob(pattern) - if not files: - bb.fatal("Unable to populate toolchain binary symlinks in %s" % pattern) - - 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/csl-versions.inc +TCMODE = "external-sourcery" +require conf/distro/include/tcmode-${TCMODE}.inc diff --git a/meta/conf/distro/include/tcmode-external-csl.inc b/meta/conf/distro/include/tcmode-external-sourcery.inc similarity index 77% copy from meta/conf/distro/include/tcmode-external-csl.inc copy to meta/conf/distro/include/tcmode-external-sourcery.inc index 0fa2ee1..79fef25 100644 --- a/meta/conf/distro/include/tcmode-external-csl.inc +++ b/meta/conf/distro/include/tcmode-external-sourcery.inc @@ -1,5 +1,5 @@ # -# Configuration to use external CSL toolchain +# Configuration to use external Sourcery G++ toolchain # EXTERNAL_TOOLCHAIN ?= "/usr/local/csl/${TARGET_ARCH}" @@ -19,22 +19,22 @@ CSL_TARGET_SYS = "${TARGET_SYS}" TARGET_PREFIX = "${CSL_TARGET_SYS}-" -PREFERRED_PROVIDER_linux-libc-headers = "external-csl-toolchain" -PREFERRED_PROVIDER_linux-libc-headers-dev = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-csl-toolchain" -PREFERRED_PROVIDER_libgcc = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/libc = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/libintl = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/libiconv = "external-csl-toolchain" -PREFERRED_PROVIDER_glibc-thread-db = "external-csl-toolchain" -PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-csl-toolchain" -PREFERRED_PROVIDER_gdbserver ??= "external-csl-toolchain" +PREFERRED_PROVIDER_linux-libc-headers = "external-sourcery-toolchain" +PREFERRED_PROVIDER_linux-libc-headers-dev = "external-sourcery-toolchain" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-sourcery-toolchain" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-sourcery-toolchain" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-sourcery-toolchain" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-sourcery-toolchain" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-sourcery-toolchain" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-sourcery-toolchain" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-sourcery-toolchain" +PREFERRED_PROVIDER_libgcc = "external-sourcery-toolchain" +PREFERRED_PROVIDER_virtual/libc = "external-sourcery-toolchain" +PREFERRED_PROVIDER_virtual/libintl = "external-sourcery-toolchain" +PREFERRED_PROVIDER_virtual/libiconv = "external-sourcery-toolchain" +PREFERRED_PROVIDER_glibc-thread-db = "external-sourcery-toolchain" +PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-sourcery-toolchain" +PREFERRED_PROVIDER_gdbserver ??= "external-sourcery-toolchain" # No need to re-compile the locale files GLIBC_INTERNAL_USE_BINARY_LOCALE = "precompiled" diff --git a/meta/recipes-core/meta/external-csl-toolchain.bb b/meta/recipes-core/meta/external-sourcery-toolchain.bb similarity index 100% rename from meta/recipes-core/meta/external-csl-toolchain.bb rename to meta/recipes-core/meta/external-sourcery-toolchain.bb diff --git a/meta/recipes-core/meta/external-csl-toolchain/SUPPORTED b/meta/recipes-core/meta/external-sourcery-toolchain/SUPPORTED similarity index 100% rename from meta/recipes-core/meta/external-csl-toolchain/SUPPORTED rename to meta/recipes-core/meta/external-sourcery-toolchain/SUPPORTED -- 1.7.10.2