From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com ([134.134.136.20]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QMpFy-0003ul-9X for openembedded-core@lists.openembedded.org; Thu, 19 May 2011 00:30:18 +0200 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 18 May 2011 15:27:20 -0700 X-ExtLoop1: 1 Received: from unknown (HELO swold-MOBL.bigsur.com) ([10.255.12.160]) by orsmga002.jf.intel.com with ESMTP; 18 May 2011 15:27:20 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Wed, 18 May 2011 15:26:39 -0700 Message-Id: <6fb2a671448d42387422d8b06a793341ff2e7ee8.1305756950.git.sgw@linux.intel.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 10/30] Add adt repo checking X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 May 2011 22:30:18 -0000 From: Jessica Zhang Signed-off-by: Jessica Zhang --- .../installer/adt-installer/adt_installer | 13 ++++++++++++- .../installer/adt-installer/adt_installer.conf | 2 +- 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 9336b9e..1dd07b7 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 b518c53..0c93237 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 -- 1.7.3.4