[PATCH 0/1] Fix powerpc environment file naming in adt-installer

[PATCH 0/1] Fix powerpc environment file naming in adt-installer

[Lianhao Lu]

The yocto bug #2055 was reopened due to the oe-core commit c2d96179. This patch fix this by adapting to the new powerpc environment file name in adt-installer.

The following changes since commit c8afc79b5d3205355ad61d2589221bf8babe8395:
  Noor Ahsan (1):
        libc-packgae.bbclass: Add i686 support in locale_arch_options

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: Adapted environment file name for powerpc.

 .../adt-installer/scripts/adt_installer_internal   |    2 --
 .../installer/adt-installer_1.0.bb                 |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

[PATCH 1/1] adt-installer: Adapted environment file name for powerpc.

[Lianhao Lu]

Adpated to the new environment file name for powerpc, due to the oe-core
commit c2d96179.

Fixed bug [YOCTO #2055].

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
 .../adt-installer/scripts/adt_installer_internal   |    2 --
 .../installer/adt-installer_1.0.bb                 |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index 684dc88..6201095 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -175,8 +175,6 @@ 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
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 27937d9..07bef88 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -30,7 +30,7 @@ ALLOW_EMPTY = "1"
 
 PACKAGES = ""
 
-PR = "r7"
+PR = "r8"
 
 ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
 ADT_DIR = "${WORKDIR}/adt-installer/"
-- 
1.7.0.4

Re: [PATCH 0/1] Fix powerpc environment file naming in adt-installer

[Saul Wold]

On 03/29/2012 11:06 PM, Lianhao Lu wrote:
> The yocto bug #2055 was reopened due to the oe-core commit c2d96179. This patch fix this by adapting to the new powerpc environment file name in adt-installer.
>
> The following changes since commit c8afc79b5d3205355ad61d2589221bf8babe8395:
>    Noor Ahsan (1):
>          libc-packgae.bbclass: Add i686 support in locale_arch_options
>
> 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: Adapted environment file name for powerpc.
>
>   .../adt-installer/scripts/adt_installer_internal   |    2 --
>   .../installer/adt-installer_1.0.bb                 |    2 +-
>   2 files changed, 1 insertions(+), 3 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Merged into OE-Core

Thanks
	Sau!