summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJun Zhang <jun.zhang@windriver.com>2016-02-19 16:00:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-21 09:32:41 +0000
commita33236049e006c9d93d0515388376cdc638cfaf1 (patch)
treed370d67b1267883c64b1b5857aa54862b818a65d /meta
parent4d2910f832ba9f3cba933df005e402799a728cb0 (diff)
downloadpoky-a33236049e006c9d93d0515388376cdc638cfaf1.tar.gz
toolchain-scripts.bbclass: add three other path to PATH in env.sh
in sdk,there are some utils in sysroot/host-os/bin, sysroot/host-os/sbin/,sysroot/host-os/usr/bin need to use, so add these three paths to PATH in env.sh. (From OE-Core rev: 1116572916443109176c0df32efc275eceeb706a) Signed-off-by: Jun Zhang <jun.zhang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/toolchain-scripts.bbclass5
-rw-r--r--meta/conf/bitbake.conf3
2 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 1566dd64d9..2e2c93af41 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -9,6 +9,9 @@ TARGET_CC_ARCH_append_libc-musl = " -mmusl"
9# This function creates an environment-setup-script for use in a deployable SDK 9# This function creates an environment-setup-script for use in a deployable SDK
10toolchain_create_sdk_env_script () { 10toolchain_create_sdk_env_script () {
11 # Create environment setup script 11 # Create environment setup script
12 base_sbindir=${10:-${base_sbindir_nativesdk}}
13 base_bindir=${9:-${base_bindir_nativesdk}}
14 sbindir=${8:-${sbindir_nativesdk}}
12 sdkpathnative=${7:-${SDKPATHNATIVE}} 15 sdkpathnative=${7:-${SDKPATHNATIVE}}
13 prefix=${6:-${prefix_nativesdk}} 16 prefix=${6:-${prefix_nativesdk}}
14 bindir=${5:-${bindir_nativesdk}} 17 bindir=${5:-${bindir_nativesdk}}
@@ -23,7 +26,7 @@ toolchain_create_sdk_env_script () {
23 for i in ${CANADIANEXTRAOS}; do 26 for i in ${CANADIANEXTRAOS}; do
24 EXTRAPATH="$EXTRAPATH:$sdkpathnative$bindir/${TARGET_ARCH}${TARGET_VENDOR}-$i" 27 EXTRAPATH="$EXTRAPATH:$sdkpathnative$bindir/${TARGET_ARCH}${TARGET_VENDOR}-$i"
25 done 28 done
26 echo "export PATH=$sdkpathnative$bindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$PATH' >> $script 29 echo "export PATH=$sdkpathnative$bindir:$sdkpathnative$sbindir:$sdkpathnative$base_bindir:$sdkpathnative$base_sbindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$PATH' >> $script
27 echo "export CCACHE_PATH=$sdkpathnative$bindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$CCACHE_PATH' >> $script 30 echo "export CCACHE_PATH=$sdkpathnative$bindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$CCACHE_PATH' >> $script
28 echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script 31 echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script
29 echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig' >> $script 32 echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig' >> $script
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 631b759349..4ea0fe56fa 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -62,6 +62,9 @@ bindir_cross = "/bin"
62bindir_crossscripts = "${bindir}/crossscripts" 62bindir_crossscripts = "${bindir}/crossscripts"
63prefix_nativesdk = "/usr" 63prefix_nativesdk = "/usr"
64bindir_nativesdk = "${prefix_nativesdk}/bin" 64bindir_nativesdk = "${prefix_nativesdk}/bin"
65sbindir_nativesdk = "${prefix_nativesdk}/sbin"
66base_bindir_nativesdk = "/bin"
67base_sbindir_nativesdk = "/sbin"
65includedir_nativesdk = "${prefix_nativesdk}/include" 68includedir_nativesdk = "${prefix_nativesdk}/include"
66libdir_nativesdk = "${prefix_nativesdk}/lib" 69libdir_nativesdk = "${prefix_nativesdk}/lib"
67base_libdir_nativesdk = "/lib" 70base_libdir_nativesdk = "/lib"