summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal18
-rw-r--r--meta/recipes-devtools/installer/adt-installer_1.0.bb2
2 files changed, 7 insertions, 13 deletions
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 870931e37b..6201095117 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -91,18 +91,12 @@ check_result
91OPKG_INSTALL_CMD="$OPKG_CMD " 91OPKG_INSTALL_CMD="$OPKG_CMD "
92OPKG_INSTALL_NATIVE_CMD="$OPKG_INSTALL_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR install" 92OPKG_INSTALL_NATIVE_CMD="$OPKG_INSTALL_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR install"
93 93
94echo_info "Installing pseudo nativesdk ...\n" 94BASE_HOSTSDK_PKGNAMES="pseudo opkg pkgconfig libtool autoconf automake"
95$OPKG_INSTALL_NATIVE_CMD pseudo-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE 95for pkg in $BASE_HOSTSDK_PKGNAMES; do
96check_result 96 echo_info "Installing ${pkg} nativesdk ...\n"
97echo_info "Installing opkg nativesdk ...\n" 97 $OPKG_INSTALL_NATIVE_CMD ${pkg}-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
98$OPKG_INSTALL_NATIVE_CMD opkg-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE 98 check_result
99check_result 99done
100echo_info "Installing pkgconfig nativesdk ...\n"
101$OPKG_INSTALL_NATIVE_CMD pkgconfig-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
102check_result
103echo_info "Installing libtool nativesdk ...\n"
104$OPKG_INSTALL_NATIVE_CMD libtool-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
105check_result
106 100
107for native_target_type in $YOCTOADT_TARGETS; do 101for native_target_type in $YOCTOADT_TARGETS; do
108 native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/ppc/powerpc/' -e 's/x86$/i586/'` 102 native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/ppc/powerpc/' -e 's/x86$/i586/'`
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 53911b8201..39e53c1220 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -30,7 +30,7 @@ ALLOW_EMPTY = "1"
30 30
31PACKAGES = "" 31PACKAGES = ""
32 32
33PR = "r4" 33PR = "r5"
34 34
35ADT_DEPLOY = "${TMPDIR}/deploy/sdk/" 35ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
36ADT_DIR = "${WORKDIR}/adt-installer/" 36ADT_DIR = "${WORKDIR}/adt-installer/"