[PATCH 0/2] [YOCTO #1396] 1396 is reopened from the initial fix

[PATCH 0/2] [YOCTO #1396] 1396 is reopened from the initial fix

[Jessica Zhang]

This patch revert the original fix which broke ppc/powerpc case and fix
term consistency in adt_installer.conf 

The following changes since commit 0ac19e84db3794b0d9280bd3cf9bae1719de3d6d:
  Jessica Zhang (1):
        Merge branch 'master' of ssh://git.yoctoproject.org/poky

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jzhang/1396-reopen
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jzhang/1396-reopne

Jessica Zhang (2):
  Revert "Fix adt-installer for consistent naming for powerpc and add
    all arch template for installation"
  [YOCTO #1396] Fix powerpc term and provide more template for
    different arches

 .../installer/adt-installer/adt_installer.conf     |   10 +++++-----
 .../adt-installer/scripts/adt_installer_internal   |    2 +-
 .../installer/adt-installer/scripts/data_define    |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

[PATCH 1/2] Revert "Fix adt-installer for consistent naming for powerpc and add all arch template for installation"

[Jessica Zhang]

This reverts commit ae4ad20edbb6ea023155f7ae2b00871d479e370d.
---
 .../installer/adt-installer/adt_installer.conf     |   17 ++---------------
 .../adt-installer/scripts/adt_installer_internal   |    2 +-
 .../installer/adt-installer/scripts/data_define    |    2 +-
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index e31f9af..0c93237 100644
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
@@ -27,7 +27,7 @@ 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
-# valid values are: arm, x86, x86_64, powerpc, mips with space separation between entries
+# valid values are: powerpc, mips, arm, x86, x86_64 with space separation between entries
 YOCTOADT_TARGETS="arm x86"
 # Whether install qemu or not, valid entries are: Y/N
 YOCTOADT_QEMU="Y"
@@ -40,7 +40,7 @@ YOCTOADT_NFS_UTIL="Y"
 
 #The followings are for setting up specific target architecture
 #YOCTOADT_ROOTFS_$arch is for specifying what root filesystem image files you want to download from the repository. The valid values to replace $arch are: arm, x86, x86_64, powerpc, mips.  The valid image files are: minimal, minimal-dev, sato, sato-dev, sato-sdk,lsb, lsb-dev, lsb-sdk.  If you want to download multiple images, the entries are space separated
-YOCTOADT_ROOTFS_arm="minimal"
+YOCTOADT_ROOTFS_arm="minimal sato-sdk"
 #Specify which root filesystem file to use to extract as target sysroot.  Please ensure the entry is in the list of downloaded root filesystem files that specified above in YOCTOADT_ROOTFS_$arch
 YOCTOADT_TARGET_SYSROOT_IMAGE_arm="minimal"
 #The location where the target sysroot will be setup
@@ -50,16 +50,3 @@ YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm"
 #YOCTOADT_ROOTFS_x86="sato-sdk"
 #YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sato-sdk"
 #YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86"
-
-#Here's some template of other arches, which you need to change the value in ""
-#YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64=""
-#YOCTOADT_TARGET_SYSROOT_LOC_x86_64=""
-#YOCTOADT_ROOTFS_x86_64=""
-
-#YOCTOADT_TARGET_SYSROOT_IMAGE_powerpc=""
-#YOCTOADT_TARGET_SYSROOT_LOC_powerpc=""
-#YOCTOADT_ROOTFS_powerpc=""
-
-#YOCTOADT_TARGET_SYSROOT_IMAGE_mips=""
-#YOCTOADT_TARGET_SYSROOT_LOC_mips=""
-#YOCTOADT_ROOTFS_mips=""
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 c7de0e2..870931e 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -105,7 +105,7 @@ $OPKG_INSTALL_NATIVE_CMD libtool-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
 check_result
 
 for native_target_type in $YOCTOADT_TARGETS; do
-  native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/x86$/i586/'`
+  native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/ppc/powerpc/'  -e 's/x86$/i586/'`
   echo_info "Installing cross toolchain for $native_target_type ..."
   echo_info "Installing binutils for $native_target_type ..."
   $OPKG_INSTALL_NATIVE_CMD binutils-cross-canadian-$native_target_type &>> $YOCTOADT_INSTALL_LOG_FILE
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
index 1de21d7..2781e77 100644
--- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
@@ -32,7 +32,7 @@ OPKG_LIBDIR="/var/lib"
 # List all supported root fs types and target types,
 # it will be used in user configuration validity checking
 YOCTOADT_SUPPORTED_ROOTFS="minimal minimal-dev sato sato-dev sato-sdk lsb lsb-dev lsb-sdk"
-YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc mips"
+YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm ppc mips"
 # Different host (32 bit or 64 bit) will have different opkg
 # configuration files
 YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf"
-- 
1.7.0.4

[PATCH 2/2] [YOCTO #1396] Fix powerpc term and provide more template for different arches

[Jessica Zhang]

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
---
 .../installer/adt-installer/adt_installer.conf     |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index 0c93237..2038b09 100644
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
@@ -27,7 +27,7 @@ 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
-# valid values are: powerpc, mips, arm, x86, x86_64 with space separation between entries
+# valid values are: arm, x86, x86_64, ppc, mips with space separation between entries
 YOCTOADT_TARGETS="arm x86"
 # Whether install qemu or not, valid entries are: Y/N
 YOCTOADT_QEMU="Y"
@@ -50,3 +50,16 @@ YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm"
 #YOCTOADT_ROOTFS_x86="sato-sdk"
 #YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sato-sdk"
 #YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86"
+
+#Here's some template of other arches, which you need to change the value in ""
+#YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64=""
+#YOCTOADT_TARGET_SYSROOT_LOC_x86_64=""
+#YOCTOADT_ROOTFS_x86_64=""
+
+#YOCTOADT_TARGET_SYSROOT_IMAGE_ppc=""
+#YOCTOADT_TARGET_SYSROOT_LOC_ppc=""
+#YOCTOADT_ROOTFS_ppc=""
+
+#YOCTOADT_TARGET_SYSROOT_IMAGE_mips=""
+#YOCTOADT_TARGET_SYSROOT_LOC_mips=""
+#YOCTOADT_ROOTFS_mips=""
-- 
1.7.0.4

Re: [PATCH 0/2] [YOCTO #1396] 1396 is reopened from the initial fix

[Richard Purdie]

On Wed, 2011-08-31 at 12:03 -0700, Jessica Zhang wrote:
> This patch revert the original fix which broke ppc/powerpc case and fix
> term consistency in adt_installer.conf 
> 
> The following changes since commit 0ac19e84db3794b0d9280bd3cf9bae1719de3d6d:
>   Jessica Zhang (1):
>         Merge branch 'master' of ssh://git.yoctoproject.org/poky
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib jzhang/1396-reopen
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jzhang/1396-reopne
> 
> Jessica Zhang (2):
>   Revert "Fix adt-installer for consistent naming for powerpc and add
>     all arch template for installation"
>   [YOCTO #1396] Fix powerpc term and provide more template for
>     different arches

Merged to master, thanks.

Richard