adt: fix ppc/powerpcc naming bug

PATCH Applied Liping Ke 3 participants 5 messages Mar 14, 2011 – Mar 15, 2011

lore

Share & tools

lore

Liping Ke

author

2011-03-14 09:42 UTC #0 lore raw

cover adt: fix ppc/powerpcc naming bug

From: Liping Ke <[email protected]>

for ipk files on ppc, the name should be powerpc. So does the environment file name. For the tar file name, it should be ppc. This patch is to correct the arch/machine name pair. Related Bug#864

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: lke/fix-name
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lke/fix-name

Thanks,
Liping Ke <[email protected]>
---

Liping Ke (1):
adt: fix ppc/powerpcc naming bug

 .../adt-installer/scripts/adt_installer_internal   |    6 ++++--
 .../installer/adt-installer/scripts/data_define    |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

Liping Ke

author

2011-03-14 09:42 UTC #1 lore raw

PATCH 1/1 adt: fix ppc/powerpcc naming bug

From: Liping Ke <[email protected]>

for ipk files on ppc, the name should be powerpc. So does the environment file name. For the tar file name, it should be ppc. This patch is to correct the arch/machine name pair. Related Bug#864

Signed-off-by Liping ke <[email protected]>

---
 .../adt-installer/scripts/adt_installer_internal   |    6 ++++--
 .../installer/adt-installer/scripts/data_define    |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +4 -2

index bc92069..a77a3ff 100755
@@ -29,7 +29,6 @@ parse_config()
   case $INST_ARCH in 
   i[3-6]86)
     OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32
-    #POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/i586-pokysdk-linux/"
     POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/"
     ;;
   x86_64)

@@ -106,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

@@ -180,9 +179,12 @@ 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
+
 if [ ! -z "$env_filename" ]; then
   sudo sed -i -e "s%##SDKTARGETSYSROOT##%$target_sysroot%g" $env_filename
 else

meta/recipes-devtools/installer/adt-installer/scripts/data_define +1 -1

index c7bce6d..ca1d47c 100644
@@ -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"

Signature · 1 line

1.7.0.4

Ke, Liping

author

2011-03-15 02:10 UTC #2 lore raw

Hi, Jessica and Saul

Since Qing's new patch for " qemux86-64: set qemux86_64 as package arch name" is checked in, we need further changes for name match.

I will re-build and test and then send further patches.

Thanks & Regards,
criping

Quoted 88 lines

-----Original Message-----
From: [email protected] [mailto:poky- [email protected]] On Behalf Of Liping Ke
Sent: Monday, March 14, 2011 5:40 PM
To: [email protected]
Subject: [poky] [PATCH 1/1] adt: fix ppc/powerpcc naming bug
From: Liping Ke <[email protected]>
for ipk files on ppc, the name should be powerpc. So does the environment file name. For the tar file name, it should be ppc. This patch is to correct the arch/machine name pair. Related Bug#864
Signed-off-by Liping ke <[email protected]>
---
 .../adt-installer/scripts/adt_installer_internal   |    6 ++++--
 .../installer/adt-installer/scripts/data_define    |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
(quoted diff) +0 -0
installer/scripts/adt_installer_internal b/meta/recipes- devtools/installer/adt-installer/scripts/adt_installer_internal index bc92069..a77a3ff 100755
--- a/meta/recipes-devtools/installer/adt- installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt- installer/scripts/adt_installer_internal
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +0 -1
@@ -29,7 +29,6 @@ parse_config()
   case $INST_ARCH in
   i[3-6]86)
     OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32
-    #POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/i586-pokysdk-
linux/"
POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-
linux/"
     ;;
x86_64)
(quoted diff) +0 -0
@@ -106,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
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +3 -0
@@ -180,9 +179,12 @@ 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
+
 if [ ! -z "$env_filename" ]; then
   sudo sed -i -e "s%##SDKTARGETSYSROOT##%$target_sysroot%g"
$env_filename
else
(quoted diff) +0 -0
installer/scripts/data_define b/meta/recipes-devtools/installer/adt- installer/scripts/data_define
index c7bce6d..ca1d47c 100644
meta/recipes-devtools/installer/adt-installer/scripts/data_define +0 -0
@@ -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"
meta/recipes-devtools/installer/adt-installer/scripts/data_define +1 -2
-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
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Zhang, Jessica

2011-03-15 03:32 UTC #3 lore raw

Quoted 6 lines · Liping

Hi, Jessica and Saul
Since Qing's new patch for " qemux86-64: set qemux86_64 as package arch name" is checked in, we need further changes for name match.
I will re-build and test and then send further patches.

Liping,

If possible, please send your patch by our tomorrow so I can ensure it'll be picked.

Thanks,
Jessica

Quoted 85 lines

Thanks & Regards,
criping
Quoted 79 lines
-----Original Message-----
From: [email protected] [mailto:poky- [email protected]] On Behalf Of Liping Ke
Sent: Monday, March 14, 2011 5:40 PM
To: [email protected]
Subject: [poky] [PATCH 1/1] adt: fix ppc/powerpcc naming bug
From: Liping Ke <[email protected]>
for ipk files on ppc, the name should be powerpc. So does the environment file name. For the tar file name, it should be ppc. This patch is to correct the arch/machine name pair. Related Bug#864
Signed-off-by Liping ke <[email protected]>
---
 .../adt-installer/scripts/adt_installer_internal   |    6 ++++--
 .../installer/adt-installer/scripts/data_define    |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
(quoted diff) +0 -0
installer/scripts/adt_installer_internal b/meta/recipes- devtools/installer/adt-installer/scripts/adt_installer_internal index bc92069..a77a3ff 100755
--- a/meta/recipes-devtools/installer/adt- installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt- installer/scripts/adt_installer_internal
(quoted diff) +0 -1
@@ -29,7 +29,6 @@ parse_config()
   case $INST_ARCH in
   i[3-6]86)
     OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32
-    #POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/i586-pokysdk-
     linux/"
 
   POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-
linux/" ;; x86_64) @@ -106,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 @@ -180,9 +179,12 @@ 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/scripts/adt_installer_internal +1 -0
+
 if [ ! -z "$env_filename" ]; then
   sudo sed -i -e "s%##SDKTARGETSYSROOT##%$target_sysroot%g"
 $env_filename else
(quoted diff) +0 -0
installer/scripts/data_define b/meta/recipes-devtools/installer/adt- installer/scripts/data_define index c7bce6d..ca1d47c 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
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Richard Purdie

Applied

2011-03-14 21:11 UTC #4 lore raw

In reply to Liping Ke

Quoted 18 lines · Liping Ke

From: Liping Ke <[email protected]>
for ipk files on ppc, the name should be powerpc. So does the environment file name. For the tar file name, it should be ppc. This patch is to correct the arch/machine name pair. Related Bug#864
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: lke/fix-name
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lke/fix-name
Thanks,
Liping Ke <[email protected]>
---

Quoted 6 lines

Liping Ke (1):
adt: fix ppc/powerpcc naming bug

 .../adt-installer/scripts/adt_installer_internal   |    6 ++++--
 .../installer/adt-installer/scripts/data_define    |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

Merged into OE-Core and Poky master.

Cheers,

Richard