meta-environment: set correct *MULTIMACH_TARGET_SYS.
Fixed [BUGID #1299]. OLD_MULTIMACH_TARGET_SYS is no longer available. Use new recipe-scope variable REAL_MULTIMACH_TARGET_SYS instead. (From OE-Core rev: b69a2be2f30dc633597399d42d6c87d9f0910c1a) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
8685aa52d1
commit
e464fb9a28
|
@ -66,13 +66,14 @@ toolchain_create_tree_env_script () {
|
|||
# This function creates an environment-setup-script for use by the ADT installer
|
||||
toolchain_create_sdk_env_script_for_installer () {
|
||||
# Create environment setup script
|
||||
script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${OLD_MULTIMACH_TARGET_SYS}
|
||||
local multimach_target_sys=$1
|
||||
script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${multimach_target_sys}
|
||||
rm -f $script
|
||||
touch $script
|
||||
echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${OLD_MULTIMACH_TARGET_SYS}:$PATH' >> $script
|
||||
echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/'"${multimach_target_sys}"':$PATH' >> $script
|
||||
echo 'export PKG_CONFIG_SYSROOT_DIR=##SDKTARGETSYSROOT##' >> $script
|
||||
echo 'export PKG_CONFIG_PATH=##SDKTARGETSYSROOT##${target_libdir}/pkgconfig' >> $script
|
||||
echo 'export CONFIG_SITE=${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS}' >> $script
|
||||
echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script
|
||||
echo 'export CC=${TARGET_PREFIX}gcc' >> $script
|
||||
echo 'export CXX=${TARGET_PREFIX}g++' >> $script
|
||||
echo 'export GDB=${TARGET_PREFIX}gdb' >> $script
|
||||
|
|
|
@ -2,13 +2,14 @@ DESCRIPTION = "Package of environment files for SDK"
|
|||
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
|
||||
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||
LICENSE = "MIT"
|
||||
PR = "r4"
|
||||
PR = "r5"
|
||||
|
||||
EXCLUDE_FROM_WORLD = "1"
|
||||
|
||||
inherit toolchain-scripts
|
||||
# get target config site before inheritting cross-canadian
|
||||
TARGET_CONFIG_SITE := "${@siteinfo_get_files(d)}"
|
||||
REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
|
||||
|
||||
SDK_DIR = "${WORKDIR}/sdk"
|
||||
SDK_OUTPUT = "${SDK_DIR}/image"
|
||||
|
@ -22,12 +23,12 @@ do_generate_content() {
|
|||
rm -rf ${SDK_OUTPUT}
|
||||
mkdir -p ${SDK_OUTPUT}/${SDKPATH}
|
||||
|
||||
toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE}
|
||||
toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE}
|
||||
|
||||
toolchain_create_sdk_env_script_for_installer
|
||||
toolchain_create_sdk_env_script_for_installer ${REAL_MULTIMACH_TARGET_SYS}
|
||||
|
||||
# Add version information
|
||||
toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${OLD_MULTIMACH_TARGET_SYS}
|
||||
toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS}
|
||||
}
|
||||
addtask generate_content before do_install after do_compile
|
||||
|
||||
|
|
Loading…
Reference in New Issue