summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Zhang <jessica.zhang@intel.com>2011-05-17 21:23:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-19 23:33:41 +0100
commit0004344116f816167d368d012d1d8aeaee1cb010 (patch)
tree75d02587e84fa8f3cf1c3dc27d790df46c573a03
parent993a2367f881f1f4eaa10339cde93c7058660d67 (diff)
downloadopenembedded-core-0004344116f816167d368d012d1d8aeaee1cb010.tar.gz
Add adt repo checking
Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer13
-rw-r--r--meta/recipes-devtools/installer/adt-installer/adt_installer.conf2
2 files changed, 13 insertions, 2 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index 9336b9ec68..1dd07b7f34 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -228,7 +228,7 @@ if [ -f "$LOCAL_DOWNLOAD/$filename" ]; then
fi
fi
echo_info "Downloading file: $filename..."
-wget "$YOCTOADT_IPKG_REPO/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE"
+wget "$YOCTOADT_REPO/rootfs/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE"
}
@@ -339,6 +339,17 @@ user_inst_type="$?"
validate_config
check_result
+
+#check adt_repo exist
+wget $YOCTOADT_REPO 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE"
+if grep -q "ERROR 404: Not Found" $YOCTOADT_INSTALL_LOG_FILE; then
+ echo -e "[ADT_INST] Error: YOCTOADT_REPO does not exist: $YOCTOADT_REPO"
+ echo -e "\n#############################################################################"
+ echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. "
+ echo -e "#############################################################################\n"
+ exit -1
+fi
+
#firstly we need to install opkg host
install_opkg
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index b518c5362a..0c93237ef1 100644
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
@@ -23,7 +23,7 @@
# Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on
-YOCTOADT_IPKG_REPO="http://adtrepo.yoctoproject.org/$YOCTOADT_VERSION/rootfs"
+YOCTOADT_REPO="http://adtrepo.yoctoproject.org/$YOCTOADT_VERSION"
# The following are for system wide setup
# Target architectures that you want to setup host cross dev environment for