summaryrefslogtreecommitdiffstats
path: root/meta
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:40:36 +0100
commit30358f0658690e61a8d71f31c1e31a298bedbd45 (patch)
tree5c67a10b505b59125dd791407a2c75a91b61a6c2 /meta
parentd1df75115e9c23ceac5ef26611e38835a52f22c5 (diff)
downloadpoky-30358f0658690e61a8d71f31c1e31a298bedbd45.tar.gz
Add adt repo checking
(From OE-Core rev: 0004344116f816167d368d012d1d8aeaee1cb010) Signed-off-by: Jessica Zhang <jessica.zhang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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
228 fi 228 fi
229fi 229fi
230echo_info "Downloading file: $filename..." 230echo_info "Downloading file: $filename..."
231wget "$YOCTOADT_IPKG_REPO/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE" 231wget "$YOCTOADT_REPO/rootfs/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE"
232} 232}
233 233
234 234
@@ -339,6 +339,17 @@ user_inst_type="$?"
339 339
340validate_config 340validate_config
341check_result 341check_result
342
343#check adt_repo exist
344wget $YOCTOADT_REPO 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE"
345if grep -q "ERROR 404: Not Found" $YOCTOADT_INSTALL_LOG_FILE; then
346 echo -e "[ADT_INST] Error: YOCTOADT_REPO does not exist: $YOCTOADT_REPO"
347 echo -e "\n#############################################################################"
348 echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. "
349 echo -e "#############################################################################\n"
350 exit -1
351fi
352
342#firstly we need to install opkg host 353#firstly we need to install opkg host
343install_opkg 354install_opkg
344 355
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 @@
23 23
24# Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on 24# Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on
25 25
26YOCTOADT_IPKG_REPO="http://adtrepo.yoctoproject.org/$YOCTOADT_VERSION/rootfs" 26YOCTOADT_REPO="http://adtrepo.yoctoproject.org/$YOCTOADT_VERSION"
27 27
28# The following are for system wide setup 28# The following are for system wide setup
29# Target architectures that you want to setup host cross dev environment for 29# Target architectures that you want to setup host cross dev environment for