Skip to contentSkip to conversation

adt_installer: several fixes

PATCH New Chong Lu 1 participant 5 messages Jul 4, 2014

lore
Share & tools
lore

Chong Lu

author
#0 lore raw

cover adt_installer: several fixes

The following changes since commit 359f08766fac29d56a763de712434d8f0536441f:

yocto-bsp: Drop GLIBC_ADDONS setting (2014-07-04 09:12:35 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib chonglu/adtinstaller
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/adtinstller

Chong Lu (4):
adt_installer: remove unnecessary variable
adt_installer: fix syntax error
adt_installer: check the result of updating opkg
adt_installer: not download repo page

 meta/recipes-devtools/installer/adt-installer/adt_installer           | 4 ++--
 .../installer/adt-installer/scripts/adt_installer_internal            | 4 ++--
 meta/recipes-devtools/installer/adt-installer_1.0.bb                  | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/4 adt_installer: remove unnecessary variable

YOCTOADT_VERSION is not included in adt_installer.conf file. Remove this variable, because we don't need it.

Signed-off-by Chong Lu <[email protected]>
---
 meta/recipes-devtools/installer/adt-installer_1.0.bb | 2 --
 1 file changed, 2 deletions(-)
meta/recipes-devtools/installer/adt-installer_1.0.bb +0 -2
index 6380b6c..6a63e79 100644
@@ -34,7 +34,6 @@ PR = "r11"
 
 ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
 ADT_DIR = "${WORKDIR}/adt-installer/"
-YOCTOADT_VERSION = "${SDK_VERSION}"
 S = "${WORKDIR}/opkg-${PV}"
 
 PV = "0.2.0"

@@ -74,7 +73,6 @@ fakeroot do_populate_adt () {
 	cp -r scripts ${ADT_DIR}/
 	cp adt_installer ${ADT_DIR}
 	cp adt_installer.conf ${ADT_DIR}
-	sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf
 	sed -i -e 's#ADTREPO#${ADTREPO}#' ${ADT_DIR}/adt_installer.conf
 	echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define
 	echo 'DEFAULT_INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 2/4 adt_installer: fix syntax error

In reply to Chong Lu

We need to check YOCTOADT_QEMU variable whether is equal to "y". So we should use "==" rather than "=".

Signed-off-by Chong Lu <[email protected]>
---
 .../installer/adt-installer/scripts/adt_installer_internal              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +1 -1
index f9c6d18..6a219a3 100755
@@ -169,7 +169,7 @@ for target_type in $YOCTOADT_TARGETS; do
   $SUDO sed -i -e "s%##SDKTARGETSYSROOT##%$target_sysroot%g" $env_script
 done
 
-if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" = "y" ]; then
+if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" == "y" ]; then
   echo_info "\nInstalling qemu native ..."
   $OPKG_INSTALL_NATIVE_CMD nativesdk-qemu &>> $YOCTOADT_INSTALL_LOG_FILE
   check_result
Signature · 1 line
1.9.1
author
#3 lore raw

PATCH 3/4 adt_installer: check the result of updating opkg

In reply to Chong Lu

We should check the result of updating opkg rather than echo_info. So we should call check_result function after updating opkg.

Signed-off-by Chong Lu <[email protected]>
---
 .../installer/adt-installer/scripts/adt_installer_internal              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +1 -1
index 6a219a3..cdf93da 100755
@@ -131,8 +131,8 @@ fi
 
 echo_info "Updating opkg..."
 $OPKG_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR update &>> $YOCTOADT_INSTALL_LOG_FILE
-echo_info "opkg update process ended..."
 check_result
+echo_info "opkg update process ended..."
 
 #install below must sdk-host packages
 OPKG_INSTALL_CMD="$OPKG_CMD "
Signature · 1 line
1.9.1
author
#4 lore raw

PATCH 4/4 adt_installer: not download repo page

In reply to Chong Lu

Add "--spider" argument to wget command, since we don't need to download repo page, just check that it is there.

Signed-off-by Chong Lu <[email protected]>
---
 meta/recipes-devtools/installer/adt-installer/adt_installer | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/installer/adt-installer/adt_installer +2 -2
index 7fc37f8..24db247 100755
@@ -379,8 +379,8 @@ 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
+wget --spider $YOCTOADT_REPO 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE"
+if grep -q "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. "
Signature · 1 line
1.9.1