From e52020ed1792f955bdaa4d26d69a49aadb7962aa Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 5 Nov 2013 22:09:51 +0000 Subject: toolchain-scripts/meta-environment: Merge toolchain_create_sdk_env_script and the for_installer variant Having two scripts which do basically the same thing is a nightmare. This merges them together. It also makes the sysroot location a variable in its own right which may be more useful for end users wanting to change sysroot. (From OE-Core rev: 213e0c67e938b802e6bb2246f00b7343a6f77b99) Signed-off-by: Richard Purdie --- meta/recipes-core/meta/meta-environment.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-core/meta') diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index 3a71a9bb2e..c7be404ffe 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb @@ -24,7 +24,7 @@ do_generate_content() { toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} - toolchain_create_sdk_env_script_for_installer ${REAL_MULTIMACH_TARGET_SYS} + toolchain_create_sdk_env_script ${SDK_OUTPUT}/${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS} ${REAL_MULTIMACH_TARGET_SYS} '##SDKTARGETSYSROOT##' ${target_libdir} ${target_includedir} # Add version information toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS} -- cgit 1.2.3-korg