diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-20 17:55:16 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-20 18:47:31 +0100 |
| commit | c056aeaa13549b404088e3d465f3b03443e5ab88 (patch) | |
| tree | 6893bfe7bce94706e67e3c40a6ef0695d616a772 /meta | |
| parent | 16e7d595987634e503104395663f7084108ced9a (diff) | |
| download | openembedded-core-contrib-c056aeaa13549b404088e3d465f3b03443e5ab88.tar.gz | |
POKY_NATIVE_SYSROOT -> OECORE_NATIVE_SYSROOT
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index ef21784b98..aa34b98b51 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -26,7 +26,7 @@ toolchain_create_sdk_env_script () { echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script echo 'export CPPFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script - echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script + echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script } @@ -57,7 +57,7 @@ toolchain_create_tree_env_script () { fi echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script - echo 'export POKY_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script + echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script echo 'export POKY_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script } @@ -87,7 +87,7 @@ toolchain_create_sdk_env_script_for_installer () { echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script echo 'export CPPFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script - echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script + echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal index 0fd9e47e98..7e76cc0744 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal @@ -29,11 +29,11 @@ parse_config() case $INST_ARCH in i[3-6]86) OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32 - POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/" + OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/" ;; x86_64) OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64 - POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64-pokysdk-linux/" + OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64-pokysdk-linux/" ;; *) echo_info "[ADT_INST] Error: Installation Machine is not supported!" @@ -124,9 +124,9 @@ for native_target_type in $YOCTOADT_TARGETS; do done # Link the ld.so.cache file into the hosts filesystem -if [ ! -f "$POKY_NATIVE_SYSROOT/etc/ld.so.cache" ]; then +if [ ! -f "$OECORE_NATIVE_SYSROOT/etc/ld.so.cache" ]; then echo_info "Link the ld.so.cache file into the host filesystem" -sudo ln -s /etc/ld.so.cache $POKY_NATIVE_SYSROOT/etc/ld.so.cache +sudo ln -s /etc/ld.so.cache $OECORE_NATIVE_SYSROOT/etc/ld.so.cache check_result fi @@ -175,7 +175,7 @@ qemu_type=`echo "$1" | sed -e 's/x86_64/x86-64/'` sysroot_image_name="core-image-$target_sysroot_image-qemu$qemu_type.tar.bz2" #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..." -scripts/extract_rootfs $sysroot_image_name $target_sysroot $POKY_NATIVE_SYSROOT $user_inst_type +scripts/extract_rootfs $sysroot_image_name $target_sysroot $OECORE_NATIVE_SYSROOT $user_inst_type check_result echo_info "Updating environment script with target sysroot location." diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs b/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs index 3dd47f0f75..62dc170c8a 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs +++ b/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs @@ -61,7 +61,7 @@ extract_rootfs() #Parameter detail is listed below: #Param 4: Silent install or customize install -#Param 3: POKY_NATIVE_SYSROOT +#Param 3: OECORE_NATIVE_SYSROOT #Param 2: user defined rootfs extraction directory #param 1: sysroot image name extract_rootfs $1 $2 $3 $4 |