Skip to contentSkip to conversation

toolchain-script: use immediate expansion for TOOLCHAIN_CONFIGSITE_NOCACHE

PATCH In review Chen Qi 1 participant 3 messages Oct 30, 2015 – Mar 15, 2016

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover toolchain-script: use immediate expansion for TOOLCHAIN_CONFIGSITE_NOCACHE

The following changes since commit f787b688f2884ce3fa888b4041030538c7d2bf55:

oeqa/utils/decorators: fix missing keyword arguments on decorators (2015-10-27 07:22:22 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib ChenQi/toolchain-site-config
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/toolchain-site-config

Chen Qi (1):
toolchain-script: use immediate expansion for
TOOLCHAIN_CONFIGSITE_NOCACHE

 meta/classes/toolchain-scripts.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 toolchain-script: use immediate expansion for TOOLCHAIN_CONFIGSITE_NOCACHE

Use immediate expansion for the assignment to avoid other classes modifying variables like HOST_ARCH which changes the result. This happens in the meta-environment recipe. It inherits cross-canadian which changes HOST_ARCH from TARGET_ARCH to SDK_ARCH, resulting in wrong site config files in the generated SDK.

Signed-off-by Chen Qi <[email protected]>
---
 meta/classes/toolchain-scripts.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/toolchain-scripts.bbclass +1 -1
index d0b2b91..4427369 100644
@@ -98,7 +98,7 @@ EOF
 }
 
 #we get the cached site config in the runtime
-TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d, True)}"
+TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}"
 TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d"
 TOOLCHAIN_NEED_CONFIGSITE_CACHE ??= "virtual/${MLPREFIX}libc ncurses"
Signature · 1 line
1.9.1
author
#2 lore raw

ping

Quoted 24 lines · Chen Qi

Use immediate expansion for the assignment to avoid other classes modifying variables like HOST_ARCH which changes the result. This happens in the meta-environment recipe. It inherits cross-canadian which changes HOST_ARCH from TARGET_ARCH to SDK_ARCH, resulting in wrong site config files in the generated SDK.

Signed-off-by Chen Qi <[email protected]>
---
  meta/classes/toolchain-scripts.bbclass | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/toolchain-scripts.bbclass +1 -1
index d0b2b91..4427369 100644
@@ -98,7 +98,7 @@ EOF
  }
 
  #we get the cached site config in the runtime
-TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d, True)}"
+TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}"
  TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d"
  TOOLCHAIN_NEED_CONFIGSITE_CACHE ??= "virtual/${MLPREFIX}libc ncurses"