Patchwork [1/1] siteinfo.bbclass: Add powerpc-linux-gnuspe.

login
register
mail settings
Submitter Leon Woestenberg
Date May 11, 2011, 10:29 a.m.
Message ID <687fb20407ee32261a840c9e475b489319d8ee62.1305109178.git.leon@sidebranch.com>
Download mbox | patch
Permalink /patch/3755/
State New, archived
Headers show

Comments

Leon Woestenberg - May 11, 2011, 10:29 a.m.
From: Leon Woestenberg <leon@sidebranch.com>

Re-add powerpc-linux-gnuspe, from OpenEmbedded. Also adds support
to poky.conf so that minimal-core-image builds with DISTRO=poky,

Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
---
 meta/classes/siteinfo.bbclass |    1 +
 meta/conf/distro/poky.conf    |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
Khem Raj - May 13, 2011, 3:50 a.m.
On Wed, May 11, 2011 at 3:29 AM, Leon Woestenberg
<leon.woestenberg@gmail.com> wrote:
> From: Leon Woestenberg <leon@sidebranch.com>
>
> Re-add powerpc-linux-gnuspe, from OpenEmbedded. Also adds support
> to poky.conf so that minimal-core-image builds with DISTRO=poky,
>

you need to rebase this patch on latest oe-core

> Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
> ---
>  meta/classes/siteinfo.bbclass |    1 +
>  meta/conf/distro/poky.conf    |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
> index df29097..731ccd1 100644
> --- a/meta/classes/siteinfo.bbclass
> +++ b/meta/classes/siteinfo.bbclass
> @@ -47,6 +47,7 @@ def get_siteinfo_list(d):
>                "powerpc-darwin":          "endian-big bit-32 common-darwin",\
>                "ppc-linux":               "endian-big bit-32 common-glibc powerpc-common",\
>               "powerpc-linux":           "endian-big bit-32 common-glibc powerpc-common",\
> +               "powerpc-linux-gnuspe":    "endian-big bit-32 common-glibc powerpc-common",\
>                "powerpc-linux-uclibc":    "endian-big bit-32 common-uclibc powerpc-common",\
>                "sh3-linux":               "endian-little bit-32 common-glibc sh-common",\
>                "sh4-linux":               "endian-little bit-32 common-glibc sh-common",\
> diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
> index 71e40de..536fdc9 100644
> --- a/meta/conf/distro/poky.conf
> +++ b/meta/conf/distro/poky.conf
> @@ -55,6 +55,7 @@ KERNEL_CONSOLE = "ttyS0"
>  # Default to TARGETOS values for EABI on arm
>  GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
>  UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
> +GLIBCTARGETOS = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d,1) in ['ppce500', 'ppce500v2']]}"
>
>  POKYMODE ?= "default"
>  require conf/distro/include/poky-${POKYMODE}.inc
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Richard Purdie - May 13, 2011, 9:26 a.m.
On Thu, 2011-05-12 at 20:50 -0700, Khem Raj wrote:
> On Wed, May 11, 2011 at 3:29 AM, Leon Woestenberg
> <leon.woestenberg@gmail.com> wrote:
> > From: Leon Woestenberg <leon@sidebranch.com>
> >
> > Re-add powerpc-linux-gnuspe, from OpenEmbedded. Also adds support
> > to poky.conf so that minimal-core-image builds with DISTRO=poky,
> >
> 
> you need to rebase this patch on latest oe-core

I resolved the conflict when I merged this:

http://git.openembedded.net/cgit.cgi/openembedded-core/commit/?id=701a725d118c1a2edd1e54798d85e864b45e19a2

Cheers,

Richard
Leon Woestenberg - May 13, 2011, 10:28 a.m.
Hello Khem,

On Fri, May 13, 2011 at 5:50 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On Wed, May 11, 2011 at 3:29 AM, Leon Woestenberg
> <leon.woestenberg@gmail.com> wrote:
>> From: Leon Woestenberg <leon@sidebranch.com>
>> Re-add powerpc-linux-gnuspe, from OpenEmbedded. Also adds support
>> to poky.conf so that minimal-core-image builds with DISTRO=poky,
>
> you need to rebase this patch on latest oe-core
>
Yes, I was using oe-core-contrib/master as a base, wrongly assuming
that that is the correct base for -contrib fixes/additions.

Regards,
Richard Purdie - May 13, 2011, 10:45 a.m.
On Fri, 2011-05-13 at 12:28 +0200, Leon Woestenberg wrote:
> Hello Khem,
> 
> On Fri, May 13, 2011 at 5:50 AM, Khem Raj <raj.khem@gmail.com> wrote:
> > On Wed, May 11, 2011 at 3:29 AM, Leon Woestenberg
> > <leon.woestenberg@gmail.com> wrote:
> >> From: Leon Woestenberg <leon@sidebranch.com>
> >> Re-add powerpc-linux-gnuspe, from OpenEmbedded. Also adds support
> >> to poky.conf so that minimal-core-image builds with DISTRO=poky,
> >
> > you need to rebase this patch on latest oe-core
> >
> Yes, I was using oe-core-contrib/master as a base, wrongly assuming
> that that is the correct base for -contrib fixes/additions.

To be fair when you wrote the patch, the conflicting distro changes were
not in either branch so in that case it didn't matter.

It was easier to take the distro changes and fix this up than the other
way around though.

Cheers,

Richard
Leon Woestenberg - May 13, 2011, 10:51 a.m.
Hello Richard,

On Fri, May 13, 2011 at 12:45 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Fri, 2011-05-13 at 12:28 +0200, Leon Woestenberg wrote:
>> On Fri, May 13, 2011 at 5:50 AM, Khem Raj <raj.khem@gmail.com> wrote:
>> > you need to rebase this patch on latest oe-core
>> >
>> Yes, I was using oe-core-contrib/master as a base, wrongly assuming
>> that that is the correct base for -contrib fixes/additions.
>
> To be fair when you wrote the patch, the conflicting distro changes were
> not in either branch so in that case it didn't matter.
>
> It was easier to take the distro changes and fix this up than the other
> way around though.
>
It takes a while before I will git it all,

Thanks for the patience and help,

Patch

diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index df29097..731ccd1 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -47,6 +47,7 @@  def get_siteinfo_list(d):
                "powerpc-darwin":          "endian-big bit-32 common-darwin",\
                "ppc-linux":               "endian-big bit-32 common-glibc powerpc-common",\ 
 	       "powerpc-linux":           "endian-big bit-32 common-glibc powerpc-common",\
+               "powerpc-linux-gnuspe":    "endian-big bit-32 common-glibc powerpc-common",\
                "powerpc-linux-uclibc":    "endian-big bit-32 common-uclibc powerpc-common",\
                "sh3-linux":               "endian-little bit-32 common-glibc sh-common",\
                "sh4-linux":               "endian-little bit-32 common-glibc sh-common",\
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 71e40de..536fdc9 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -55,6 +55,7 @@  KERNEL_CONSOLE = "ttyS0"
 # Default to TARGETOS values for EABI on arm
 GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
 UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+GLIBCTARGETOS = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d,1) in ['ppce500', 'ppce500v2']]}" 
 
 POKYMODE ?= "default"
 require conf/distro/include/poky-${POKYMODE}.inc