summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/toolchain-scripts.bbclass6
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal10
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs2
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 () {
26 echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script 26 echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
27 echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script 27 echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
28 echo 'export CPPFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script 28 echo 'export CPPFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
29 echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script 29 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
30 echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script 30 echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
31 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script 31 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
32} 32}
@@ -57,7 +57,7 @@ toolchain_create_tree_env_script () {
57 fi 57 fi
58 echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script 58 echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script
59 echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script 59 echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script
60 echo 'export POKY_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script 60 echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
61 echo 'export POKY_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script 61 echo 'export POKY_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
62} 62}
63 63
@@ -87,7 +87,7 @@ toolchain_create_sdk_env_script_for_installer () {
87 echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script 87 echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
88 echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script 88 echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
89 echo 'export CPPFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script 89 echo 'export CPPFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
90 echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script 90 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
91 echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script 91 echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
92 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script 92 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
93 echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script 93 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()
29 case $INST_ARCH in 29 case $INST_ARCH in
30 i[3-6]86) 30 i[3-6]86)
31 OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32 31 OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32
32 POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/" 32 OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/"
33 ;; 33 ;;
34 x86_64) 34 x86_64)
35 OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64 35 OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64
36 POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64-pokysdk-linux/" 36 OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64-pokysdk-linux/"
37 ;; 37 ;;
38 *) 38 *)
39 echo_info "[ADT_INST] Error: Installation Machine is not supported!" 39 echo_info "[ADT_INST] Error: Installation Machine is not supported!"
@@ -124,9 +124,9 @@ for native_target_type in $YOCTOADT_TARGETS; do
124done 124done
125 125
126# Link the ld.so.cache file into the hosts filesystem 126# Link the ld.so.cache file into the hosts filesystem
127if [ ! -f "$POKY_NATIVE_SYSROOT/etc/ld.so.cache" ]; then 127if [ ! -f "$OECORE_NATIVE_SYSROOT/etc/ld.so.cache" ]; then
128echo_info "Link the ld.so.cache file into the host filesystem" 128echo_info "Link the ld.so.cache file into the host filesystem"
129sudo ln -s /etc/ld.so.cache $POKY_NATIVE_SYSROOT/etc/ld.so.cache 129sudo ln -s /etc/ld.so.cache $OECORE_NATIVE_SYSROOT/etc/ld.so.cache
130check_result 130check_result
131fi 131fi
132 132
@@ -175,7 +175,7 @@ qemu_type=`echo "$1" | sed -e 's/x86_64/x86-64/'`
175sysroot_image_name="core-image-$target_sysroot_image-qemu$qemu_type.tar.bz2" 175sysroot_image_name="core-image-$target_sysroot_image-qemu$qemu_type.tar.bz2"
176 #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..." 176 #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..."
177 177
178scripts/extract_rootfs $sysroot_image_name $target_sysroot $POKY_NATIVE_SYSROOT $user_inst_type 178scripts/extract_rootfs $sysroot_image_name $target_sysroot $OECORE_NATIVE_SYSROOT $user_inst_type
179check_result 179check_result
180 180
181echo_info "Updating environment script with target sysroot location." 181echo_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()
61 61
62#Parameter detail is listed below: 62#Parameter detail is listed below:
63#Param 4: Silent install or customize install 63#Param 4: Silent install or customize install
64#Param 3: POKY_NATIVE_SYSROOT 64#Param 3: OECORE_NATIVE_SYSROOT
65#Param 2: user defined rootfs extraction directory 65#Param 2: user defined rootfs extraction directory
66#param 1: sysroot image name 66#param 1: sysroot image name
67extract_rootfs $1 $2 $3 $4 67extract_rootfs $1 $2 $3 $4