[OE-core] [PATCH 2/2] toolchain-scripts.bbclass: fix paths of siteconfig files

[kai.kang at windriver.com]

From: Kai Kang <kai.kang at windriver.com>

It can't find right siteconfig files in toolchain-scripts.bbclass after
adapting to RSS. Correct the paths.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
---
 meta/classes/toolchain-scripts.bbclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 6d1ba69473..cfc5eb9fae 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -158,7 +158,7 @@ EOF
 
 #we get the cached site config in the runtime
 TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d)}"
-TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d"
+TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${COMPONENTS_DIR}/${DEFAULTTUNE}"
 TOOLCHAIN_NEED_CONFIGSITE_CACHE ??= "virtual/${MLPREFIX}libc ncurses"
 DEPENDS += "${TOOLCHAIN_NEED_CONFIGSITE_CACHE}"
 
@@ -178,11 +178,12 @@ toolchain_create_sdk_siteconfig () {
 		# Resolve virtual/* names to the real recipe name using sysroot-providers info
 		case $sitefile in virtual/*)
 			sitefile=`echo $sitefile | tr / _`
-			sitefile=`cat ${STAGING_DIR_TARGET}/sysroot-providers/$sitefile`
+			sitefile=`cat ${STAGING_DIR_TARGET}/sysroot-providers/$sitefile | sed "s/^${MLPREFIX}//"`
 		esac
 
-		if [ -r ${TOOLCHAIN_CONFIGSITE_SYSROOTCACHE}/${sitefile}_config ]; then
-			cat ${TOOLCHAIN_CONFIGSITE_SYSROOTCACHE}/${sitefile}_config >> $siteconfig
+		sitefile_config=${TOOLCHAIN_CONFIGSITE_SYSROOTCACHE}/${MLPREFIX}${sitefile}/${target_datadir}/${TARGET_SYS}_config_site.d/${sitefile}_config
+		if [ -r $sitefile_config ]; then
+			cat $sitefile_config >> $siteconfig
 		fi
 	done
 }
-- 
2.18.0