From d6bbda9d7da468f4050ac3adfc0b533c51d039b0 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Fri, 26 Oct 2012 10:24:37 -0700 Subject: [PATCH] tcmode: don't early expand PATH in its adjustments To avoid issues when a user installed a Sourcery toolchain to the default path and let it modify their PATH, we iterate over PATH and remove the problematic elements. Unfortunately, in doing so, we inadvertently forced an early expansion of PATH due to getting it in its expanded form, then setting PATH based on that form. Instead, operate against the unexpanded PATH. Signed-off-by: Christopher Larson --- conf/distro/include/tcmode-external-sourcery.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc index edfeea6..43e4bc5 100644 --- a/conf/distro/include/tcmode-external-sourcery.inc +++ b/conf/distro/include/tcmode-external-sourcery.inc @@ -103,7 +103,7 @@ python toolchain_metadata_setup () { # break the build (in particular, the ia32 toolchain, as it provdes # non-prefixed binaries). install_prefix_default = bb.data.expand('${HOME}/CodeSourcery/', l) - path = d.getVar('PATH', True).split(':') + path = d.getVar('PATH', False).split(':') path = filter(lambda p: not p.startswith(install_prefix_default), path) d.setVar('PATH', ':'.join(path))