[PATCH 0/2] tcmode-external-csl: Allow overriding some key values

[PATCH 0/2] tcmode-external-csl: Allow overriding some key values

[Peter Seebach]

This tiny little set of ?= changes lets me use a different CS binary
toolchain than the one being supported by the external-csl feature by
default, allowing us to share more code.

Also I improved an error message.  (Side note:  Sorry if it's spammy
to have a separate patch for it, but I couldn't convince myself that these
two changes were doing the same thing.)

The following changes since commit 01dea384924293d0f99723073277bf6b1f4c7976:
  Christopher Larson (1):
        tcmode-external-csl: handle TUNE_PKGARCH=core2

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib seebs/toolchain
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=seebs/toolchain

Peter Seebach (2):
  tcmode-external-csl.inc: Allow for overrides
  tcmode-external-csl.inc: specify the path you couldn't find

 meta/conf/distro/include/tcmode-external-csl.inc |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

[PATCH 1/2] tcmode-external-csl.inc: Allow for overrides

[Peter Seebach]

Wind River uses binary toolchains provided by Code Sourcery, but which
have different values for a couple of the preset variables than the
generic toolchains the external-csl toolchain feature supports.  If
these values were ?= assignments, we could just assign values to them
and share the code, rather than keeping modified copies.

Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
---
 meta/conf/distro/include/tcmode-external-csl.inc |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta/conf/distro/include/tcmode-external-csl.inc b/meta/conf/distro/include/tcmode-external-csl.inc
index 11c5df5..6bdd466 100644
--- a/meta/conf/distro/include/tcmode-external-csl.inc
+++ b/meta/conf/distro/include/tcmode-external-csl.inc
@@ -7,14 +7,14 @@ 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_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}-"
@@ -58,7 +58,7 @@ def csl_target_core(d):
     }
     return coredata.get(d.getVar('TUNE_PKGARCH', True), '')
 
-CSL_TARGET_CORE = "${@csl_target_core(d)}"
+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
-- 
1.7.0.4

[PATCH 2/2] tcmode-external-csl.inc: specify the path you couldn't find

[Peter Seebach]

While misconfiguring toolchains, I noticed that one of the
diagnostic messages gave me a little less information than I'd
like about what I'd done wrong.  Displaying the glob pattern
that couldn't be matched turns out to make it a lot easier to
figure out what you did wrong.  (Answer: Not enough coffee.)

Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
---
 meta/conf/distro/include/tcmode-external-csl.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/conf/distro/include/tcmode-external-csl.inc b/meta/conf/distro/include/tcmode-external-csl.inc
index 6bdd466..731780b 100644
--- a/meta/conf/distro/include/tcmode-external-csl.inc
+++ b/meta/conf/distro/include/tcmode-external-csl.inc
@@ -100,7 +100,7 @@ def populate_toolchain_links(d):
     pattern = d.expand('${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}*')
     files = glob(pattern)
     if not files:
-        bb.fatal("Unable to populate toolchain binary symlinks")
+        bb.fatal("Unable to populate toolchain binary symlinks in %s" % pattern)
 
     bindir = d.getVar('STAGING_BINDIR_TOOLCHAIN', True)
     bb.mkdirhier(bindir)
-- 
1.7.0.4

Re: [PATCH 0/2] tcmode-external-csl: Allow overriding some key values

[Chris Larson]

On Tue, May 15, 2012 at 11:16 AM, Peter Seebach
<peter.seebach@windriver.com> wrote:
> This tiny little set of ?= changes lets me use a different CS binary
> toolchain than the one being supported by the external-csl feature by
> default, allowing us to share more code.
>
> Also I improved an error message.  (Side note:  Sorry if it's spammy
> to have a separate patch for it, but I couldn't convince myself that these
> two changes were doing the same thing.)

Looks good, thanks.
-- 
Christopher Larson

Re: [PATCH 0/2] tcmode-external-csl: Allow overriding some key values

[Saul Wold]

On 05/15/2012 09:16 PM, Peter Seebach wrote:
> This tiny little set of ?= changes lets me use a different CS binary
> toolchain than the one being supported by the external-csl feature by
> default, allowing us to share more code.
>
> Also I improved an error message.  (Side note:  Sorry if it's spammy
> to have a separate patch for it, but I couldn't convince myself that these
> two changes were doing the same thing.)
>
> The following changes since commit 01dea384924293d0f99723073277bf6b1f4c7976:
>    Christopher Larson (1):
>          tcmode-external-csl: handle TUNE_PKGARCH=core2
>
> are available in the git repository at:
>
>    git://git.yoctoproject.org/poky-contrib seebs/toolchain
>    http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=seebs/toolchain
>
> Peter Seebach (2):
>    tcmode-external-csl.inc: Allow for overrides
>    tcmode-external-csl.inc: specify the path you couldn't find
>
>   meta/conf/distro/include/tcmode-external-csl.inc |   20 ++++++++++----------
>   1 files changed, 10 insertions(+), 10 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Merged into OE-Core

Thanks
	Sau!