From 30358f0658690e61a8d71f31c1e31a298bedbd45 Mon Sep 17 00:00:00 2001 From: Jessica Zhang Date: Tue, 17 May 2011 21:23:17 -0700 Subject: Add adt repo checking (From OE-Core rev: 0004344116f816167d368d012d1d8aeaee1cb010) Signed-off-by: Jessica Zhang Signed-off-by: Richard Purdie --- meta/recipes-devtools/installer/adt-installer/adt_installer | 13 ++++++++++++- .../installer/adt-installer/adt_installer.conf | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/installer') 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 -- cgit v1.2.3-54-g00ecf