* [PATCH 0/1] adt: fix ppc/powerpcc naming bug
@ 2011-03-14 9:39 Liping Ke
2011-03-14 9:39 ` [PATCH 1/1] " Liping Ke
2011-03-14 21:11 ` [PATCH 0/1] " Richard Purdie
0 siblings, 2 replies; 5+ messages in thread
From: Liping Ke @ 2011-03-14 9:39 UTC (permalink / raw)
To: poky
From: Liping Ke <liping.ke@intel.com>
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 <liping.ke@intel.com>
---
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(-)
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/1] adt: fix ppc/powerpcc naming bug 2011-03-14 9:39 [PATCH 0/1] adt: fix ppc/powerpcc naming bug Liping Ke @ 2011-03-14 9:39 ` Liping Ke 2011-03-15 2:09 ` Ke, Liping 2011-03-14 21:11 ` [PATCH 0/1] " Richard Purdie 1 sibling, 1 reply; 5+ messages in thread From: Liping Ke @ 2011-03-14 9:39 UTC (permalink / raw) To: poky From: Liping Ke <liping.ke@intel.com> 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 <liping.ke@intel.com> --- .../adt-installer/scripts/adt_installer_internal | 6 ++++-- .../installer/adt-installer/scripts/data_define | 2 +- 2 files changed, 5 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 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 @@ -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 diff --git a/meta/recipes-devtools/installer/adt-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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] adt: fix ppc/powerpcc naming bug 2011-03-14 9:39 ` [PATCH 1/1] " Liping Ke @ 2011-03-15 2:09 ` Ke, Liping 2011-03-15 3:32 ` Zhang, Jessica 0 siblings, 1 reply; 5+ messages in thread From: Ke, Liping @ 2011-03-15 2:09 UTC (permalink / raw) To: Zhang, Jessica, poky@yoctoproject.org 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 > -----Original Message----- > From: poky-bounces@yoctoproject.org [mailto:poky- > bounces@yoctoproject.org] On Behalf Of Liping Ke > Sent: Monday, March 14, 2011 5:40 PM > To: poky@yoctoproject.org > Subject: [poky] [PATCH 1/1] adt: fix ppc/powerpcc naming bug > > From: Liping Ke <liping.ke@intel.com> > > 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 <liping.ke@intel.com> > --- > .../adt-installer/scripts/adt_installer_internal | 6 ++++-- > .../installer/adt-installer/scripts/data_define | 2 +- > 2 files changed, 5 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 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 > @@ -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 > diff --git a/meta/recipes-devtools/installer/adt- > 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 > poky@yoctoproject.org > https://lists.yoctoproject.org/listinfo/poky ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] adt: fix ppc/powerpcc naming bug 2011-03-15 2:09 ` Ke, Liping @ 2011-03-15 3:32 ` Zhang, Jessica 0 siblings, 0 replies; 5+ messages in thread From: Zhang, Jessica @ 2011-03-15 3:32 UTC (permalink / raw) To: Ke, Liping, poky@yoctoproject.org [-- Attachment #1: Type: text/plain, Size: 4165 bytes --] Ke, Liping wrote: > 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 > > Thanks & Regards, > criping > > > >> -----Original Message----- >> From: poky-bounces@yoctoproject.org [mailto:poky- >> bounces@yoctoproject.org] On Behalf Of Liping Ke >> Sent: Monday, March 14, 2011 5:40 PM >> To: poky@yoctoproject.org >> Subject: [poky] [PATCH 1/1] adt: fix ppc/powerpcc naming bug >> >> From: Liping Ke <liping.ke@intel.com> >> >> 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 <liping.ke@intel.com> >> --- >> .../adt-installer/scripts/adt_installer_internal | 6 ++++-- >> .../installer/adt-installer/scripts/data_define | 2 +- >> 2 files changed, 5 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 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 >> @@ -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 >> diff --git a/meta/recipes-devtools/installer/adt- >> 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 >> poky@yoctoproject.org >> https://lists.yoctoproject.org/listinfo/poky [-- Attachment #2: smime.p7s --] [-- Type: application/x-pkcs7-signature, Size: 8455 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/1] adt: fix ppc/powerpcc naming bug 2011-03-14 9:39 [PATCH 0/1] adt: fix ppc/powerpcc naming bug Liping Ke 2011-03-14 9:39 ` [PATCH 1/1] " Liping Ke @ 2011-03-14 21:11 ` Richard Purdie 1 sibling, 0 replies; 5+ messages in thread From: Richard Purdie @ 2011-03-14 21:11 UTC (permalink / raw) To: Liping Ke; +Cc: poky On Mon, 2011-03-14 at 17:39 +0800, Liping Ke wrote: > From: Liping Ke <liping.ke@intel.com> > > 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 <liping.ke@intel.com> > --- > > > 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-03-15 3:32 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-03-14 9:39 [PATCH 0/1] adt: fix ppc/powerpcc naming bug Liping Ke 2011-03-14 9:39 ` [PATCH 1/1] " Liping Ke 2011-03-15 2:09 ` Ke, Liping 2011-03-15 3:32 ` Zhang, Jessica 2011-03-14 21:11 ` [PATCH 0/1] " Richard Purdie
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.