Skip to contentSkip to conversation

fixed errors in adt-installer

PATCH Applied Lianhao Lu 2 participants 3 messages Mar 7, 2012 – Mar 12, 2012

lore
Share & tools
lore

Lianhao Lu

author
#0 lore raw

cover fixed errors in adt-installer

This patch fixed Yocto bug #2055.

The following changes since commit d7b8c247227f3cc82f92292407f548927e9fde78:
Richard Purdie (1):
base.bbclass: Fix PACKAGECONFIG handling when no flags are set

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib llu/bug2055
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/bug2055

Lianhao Lu (1):
adt-installer: Corrected wrong environment file names.

 .../adt-installer/scripts/adt_installer_internal   |    2 ++
 .../installer/adt-installer_1.0.bb                 |    5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)
author
#1 lore raw

PATCH 1/1 adt-installer: Corrected wrong environment file names.

[YOCTO #2055]
1. Corrected the wrong environment file name for powerpc.

2. Removed unnecessary variables in adt_installer.conf.

Signed-off-by Lianhao Lu <[email protected]>
---
 .../adt-installer/scripts/adt_installer_internal   |    2 ++
 .../installer/adt-installer_1.0.bb                 |    5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +2 -0
index 6201095..684dc88 100755
@@ -175,6 +175,8 @@ check_result
 echo_info "Updating environment script with target sysroot location."
 if [ "$1" == "x86"  ]; then
   env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*`
+elif [ "$1" == "ppc" ]; then
+  env_filename=`ls $INSTALL_FOLDER/environment-setup-powerpc*`
 else
   env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*`
 fi
meta/recipes-devtools/installer/adt-installer_1.0.bb +1 -4
index 340349d..27937d9 100644
@@ -30,7 +30,7 @@ ALLOW_EMPTY = "1"
 
 PACKAGES = ""
 
-PR = "r6"
+PR = "r7"
 
 ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
 ADT_DIR = "${WORKDIR}/adt-installer/"

@@ -68,9 +68,6 @@ fakeroot do_populate_adt () {
 	cp -r scripts ${ADT_DIR}/
 	cp adt_installer ${ADT_DIR}
 	cp adt_installer.conf ${ADT_DIR}
-	echo 'YOCTOADT_VERSION=${SDK_VERSION}' > ${ADT_DIR}/temp.conf
-        cat ${ADT_DIR}/adt_installer.conf >> ${ADT_DIR}/temp.conf
-        mv ${ADT_DIR}/temp.conf ${ADT_DIR}/adt_installer.conf
 	sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf
         echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define
         echo 'INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define
Signature · 1 line
1.7.0.4
Applied
#2 lore raw

Re: [PATCH 1/1] adt-installer: Corrected wrong environment file names.

Quoted 38 lines · Lianhao Lu

[YOCTO #2055]
1. Corrected the wrong environment file name for powerpc.

2. Removed unnecessary variables in adt_installer.conf.

Signed-off-by Lianhao Lu<[email protected]>
---
  .../adt-installer/scripts/adt_installer_internal   |    2 ++
  .../installer/adt-installer_1.0.bb                 |    5 +----
  2 files changed, 3 insertions(+), 4 deletions(-)
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +2 -0
index 6201095..684dc88 100755
@@ -175,6 +175,8 @@ check_result
  echo_info "Updating environment script with target sysroot location."
  if [ "$1" == "x86"  ]; then
    env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*`
+elif [ "$1" == "ppc" ]; then
+  env_filename=`ls $INSTALL_FOLDER/environment-setup-powerpc*`
  else
    env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*`
  fi
meta/recipes-devtools/installer/adt-installer_1.0.bb +1 -1
index 340349d..27937d9 100644
@@ -30,7 +30,7 @@ ALLOW_EMPTY = "1"
 
  PACKAGES = ""
 
-PR = "r6"
+PR = "r7"
 
  ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
  ADT_DIR = "${WORKDIR}/adt-installer/"

meta/recipes-devtools/installer/adt-installer_1.0.bb fakeroot do_populate_adt () { · line 73

Quoted 9 lines
meta/recipes-devtools/installer/adt-installer_1.0.bb +0 -3
@@ -68,9 +68,6 @@ fakeroot do_populate_adt () {
  	cp -r scripts ${ADT_DIR}/
  	cp adt_installer ${ADT_DIR}
  	cp adt_installer.conf ${ADT_DIR}
-	echo 'YOCTOADT_VERSION=${SDK_VERSION}'>  ${ADT_DIR}/temp.conf
-        cat ${ADT_DIR}/adt_installer.conf>>  ${ADT_DIR}/temp.conf
-        mv ${ADT_DIR}/temp.conf ${ADT_DIR}/adt_installer.conf
  	sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf
          echo 'SDK_VENDOR=${SDK_VENDOR}'>>  ${ADT_DIR}/scripts/data_define
          echo 'INSTALL_FOLDER=${SDKPATH}'>>  ${ADT_DIR}/scripts/data_define

Merged into OE-Core

Thanks
Sau!