u-boot do_compile should be reentrant even with ld-is-gold

u-boot do_compile should be reentrant even with ld-is-gold

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1435 bytes --]

Hi,

this commit:

reexecuting do_compile in u-boot causes .bfd being appended multiple 
times and resulting in errors like:
/bin/bash: arm-oe-linux-gnueabi-ld.bfd.bfd.bfd: command not found

Regex should be updated or patch like this:
http://git.shr-project.org/git/?p=meta-smartphone.git;a=blob;f=meta-nokia/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch;h=2564d1d456d46651778aec9113cb2515f035ba90;hb=HEAD
applied instead of sed, especially if someone sends it upstream 
(maybe it's already resolved there - I haven't checked)

commit 2e79fcd673dadeab6358fe22d47c8534c14de03e
Author: Otavio Salvador <otavio@ossystems.com.br>
Date:   Sun Apr 22 15:01:32 2012 -0300

    u-boot.inc: fix compilation when using 'gold' as linker

    Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 0445c34..a13eddc 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -36,6 +36,10 @@ SPL_IMAGE ?= "${SPL_BINARY}-${MACHINE}-${PV}-${PR}"
 SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"

 do_compile () {
+       if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
+               sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' config.mk
+       fi


-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: u-boot do_compile should be reentrant even with ld-is-gold

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1757 bytes --]

On Wed, Aug 01, 2012 at 08:50:21AM +0200, Martin Jansa wrote:
> Hi,
> 
> this commit:
> 
> reexecuting do_compile in u-boot causes .bfd being appended multiple 
> times and resulting in errors like:
> /bin/bash: arm-oe-linux-gnueabi-ld.bfd.bfd.bfd: command not found
> 
> Regex should be updated or patch like this:
> http://git.shr-project.org/git/?p=meta-smartphone.git;a=blob;f=meta-nokia/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch;h=2564d1d456d46651778aec9113cb2515f035ba90;hb=HEAD
> applied instead of sed, especially if someone sends it upstream 
> (maybe it's already resolved there - I haven't checked)

well not exactly like this one as this is causing
/bin/sh: 1: Syntax error: Bad fd number
probably from ">&" in dash

> commit 2e79fcd673dadeab6358fe22d47c8534c14de03e
> Author: Otavio Salvador <otavio@ossystems.com.br>
> Date:   Sun Apr 22 15:01:32 2012 -0300
> 
>     u-boot.inc: fix compilation when using 'gold' as linker
> 
>     Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> 
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
> index 0445c34..a13eddc 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -36,6 +36,10 @@ SPL_IMAGE ?= "${SPL_BINARY}-${MACHINE}-${PV}-${PR}"
>  SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"
> 
>  do_compile () {
> +       if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
> +               sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' config.mk
> +       fi
> 
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: u-boot do_compile should be reentrant even with ld-is-gold

[Otavio Salvador]

On Wed, Aug 1, 2012 at 3:50 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> reexecuting do_compile in u-boot causes .bfd being appended multiple
> times and resulting in errors like:
> /bin/bash: arm-oe-linux-gnueabi-ld.bfd.bfd.bfd: command not found

I am just wondering why it'd end re-executed? due changes on sstate hash?

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: u-boot do_compile should be reentrant even with ld-is-gold

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 642 bytes --]

On Wed, Aug 01, 2012 at 08:48:08AM -0300, Otavio Salvador wrote:
> On Wed, Aug 1, 2012 at 3:50 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > reexecuting do_compile in u-boot causes .bfd being appended multiple
> > times and resulting in errors like:
> > /bin/bash: arm-oe-linux-gnueabi-ld.bfd.bfd.bfd: command not found
> 
> I am just wondering why it'd end re-executed? due changes on sstate hash?

e.g. when it fails due to compile error and someone reexecutes it then
he will see arm-oe-linux-gnueabi-ld.bfd.bfd.bfd instead of real compile
error.

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: u-boot do_compile should be reentrant even with ld-is-gold

[Otavio Salvador]

On Wed, Aug 1, 2012 at 8:59 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Aug 01, 2012 at 08:48:08AM -0300, Otavio Salvador wrote:
>> On Wed, Aug 1, 2012 at 3:50 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > reexecuting do_compile in u-boot causes .bfd being appended multiple
>> > times and resulting in errors like:
>> > /bin/bash: arm-oe-linux-gnueabi-ld.bfd.bfd.bfd: command not found
>>
>> I am just wondering why it'd end re-executed? due changes on sstate hash?
>
> e.g. when it fails due to compile error and someone reexecutes it then
> he will see arm-oe-linux-gnueabi-ld.bfd.bfd.bfd instead of real compile
> error.

Wouldn't be better to grep for 'ld.bfd' and apply it *only* if not is not found?

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: u-boot do_compile should be reentrant even with ld-is-gold

[Khem Raj]

On Jul 31, 2012, at 11:54 PM, Martin Jansa <martin.jansa@gmail.com> wrote:

> well not exactly like this one as this is causing
> /bin/sh: 1: Syntax error: Bad fd number
> probably from ">&" in dash


yes. I swear I have since fixed this patch this seems to be an older version
did you look into meta-ti/master ?

Re: u-boot do_compile should be reentrant even with ld-is-gold

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1206 bytes --]

On Wed, Aug 01, 2012 at 04:02:24PM -0700, Khem Raj wrote:
> 
> On Jul 31, 2012, at 11:54 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> 
> > well not exactly like this one as this is causing
> > /bin/sh: 1: Syntax error: Bad fd number
> > probably from ">&" in dash
> 
> 
> yes. I swear I have since fixed this patch this seems to be an older version
> did you look into meta-ti/master ?

Yes, your patch is fixed in meta-ti, but cannot be used together with
Otavio's patch to u-boot.inc.

meta-ti is fine because it provides own u-boot.inc, but with your patch
and u-boot.inc from oe-core it ends like this

config.mk:
+LD     = $(call exists_bfd_ld, "$(CROSS_COMPILE)ld.bfd.bfd","$(CROSS_COMPILE)ld.bfd")

On Wed, Aug 01, 2012 at 09:32:03AM -0300, Otavio Salvador wrote:
> Wouldn't be better to grep for 'ld.bfd' and apply it *only* if not is not found?

no need for grep, something like
-               sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' config.mk
+               sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk
should be enough, I will test and send patch..

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

[PATCH] u-boot.inc: fix regexp used when ld-is-gold

[Martin Jansa]

* with old regexp it wasn't reentrant, causing stuff like this:
  -LD     = $(CROSS_COMPILE)ld
  +LD     = $(CROSS_COMPILE)ld.bfd.bfd
  -LDR    = $(CROSS_COMPILE)ldr
  +LDR    = $(CROSS_COMPILE)ld.bfd.bfdr
  when do_compile was reexecuted, also breaking LDR variable and
  http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch
  when it was used together with u-boot.inc from oe-core (meta-ti is using own u-boot.inc)

* This patch is also better solution to ld-is-gold problem then regexp in metadata.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-bsp/u-boot/u-boot.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 42bdde9..a8642f0 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -34,7 +34,7 @@ SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"
 
 do_compile () {
 	if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
-		sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' config.mk
+		sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk
 	fi
 
 	unset LDFLAGS
-- 
1.7.8.6

Re: u-boot do_compile should be reentrant even with ld-is-gold

[Khem Raj]

On Aug 2, 2012, at 4:50 AM, Martin Jansa <martin.jansa@gmail.com> wrote:

> On Wed, Aug 01, 2012 at 04:02:24PM -0700, Khem Raj wrote:
>> 
>> On Jul 31, 2012, at 11:54 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> 
>>> well not exactly like this one as this is causing
>>> /bin/sh: 1: Syntax error: Bad fd number
>>> probably from ">&" in dash
>> 
>> 
>> yes. I swear I have since fixed this patch this seems to be an older version
>> did you look into meta-ti/master ?
> 
> Yes, your patch is fixed in meta-ti, but cannot be used together with
> Otavio's patch to u-boot.inc.
> 
> meta-ti is fine because it provides own u-boot.inc, but with your patch
> and u-boot.inc from oe-core it ends like this


so why don't you migrate the patch from meta-ti into OE-Core ? and leave this sed
thing out ?

Re: [PATCH] u-boot.inc: fix regexp used when ld-is-gold

[Khem Raj]

On Aug 2, 2012, at 5:09 AM, Martin Jansa <martin.jansa@gmail.com> wrote:

> * with old regexp it wasn't reentrant, causing stuff like this:
>  -LD     = $(CROSS_COMPILE)ld
>  +LD     = $(CROSS_COMPILE)ld.bfd.bfd
>  -LDR    = $(CROSS_COMPILE)ldr
>  +LDR    = $(CROSS_COMPILE)ld.bfd.bfdr
>  when do_compile was reexecuted, also breaking LDR variable and
>  http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch
>  when it was used together with u-boot.inc from oe-core (meta-ti is using own u-boot.inc)
> 
> * This patch is also better solution to ld-is-gold problem then regexp in metadata.

It would be rather beneficial to import the u-boot patch to accommodate gold from meta-ti
this helps in creating a uniform solution to same problem. u-boot patch should be upstreamed too.

> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/recipes-bsp/u-boot/u-boot.inc |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
> index 42bdde9..a8642f0 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -34,7 +34,7 @@ SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"
> 
> do_compile () {
> 	if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
> -		sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' config.mk
> +		sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk
> 	fi
> 
> 	unset LDFLAGS
> -- 
> 1.7.8.6
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: u-boot do_compile should be reentrant even with ld-is-gold

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1517 bytes --]

On Thu, Aug 02, 2012 at 07:30:38AM -0700, Khem Raj wrote:
> 
> On Aug 2, 2012, at 4:50 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> 
> > On Wed, Aug 01, 2012 at 04:02:24PM -0700, Khem Raj wrote:
> >> 
> >> On Jul 31, 2012, at 11:54 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> >> 
> >>> well not exactly like this one as this is causing
> >>> /bin/sh: 1: Syntax error: Bad fd number
> >>> probably from ">&" in dash
> >> 
> >> 
> >> yes. I swear I have since fixed this patch this seems to be an older version
> >> did you look into meta-ti/master ?
> > 
> > Yes, your patch is fixed in meta-ti, but cannot be used together with
> > Otavio's patch to u-boot.inc.
> > 
> > meta-ti is fine because it provides own u-boot.inc, but with your patch
> > and u-boot.inc from oe-core it ends like this
> 
> 
> so why don't you migrate the patch from meta-ti into OE-Core ? and leave this sed
> thing out ?

Because all layers using u-boot.inc from oe-core probably already have
this patch and adding it to oe-core too will cause do_patch to fail.

Or those layers are not using SRC_URI from u-boot.inc and then they
won't get this patch anyway.

And I don't want to introduce another kind of automagic which would
add that patch to SRC_URI only if it's not added by some .bbappend
already.. 

One character change in that regexp fixed all use-cases I can think of,
so looks like best solution to me..

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH] u-boot.inc: fix regexp used when ld-is-gold

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2279 bytes --]

On Thu, Aug 02, 2012 at 07:32:02AM -0700, Khem Raj wrote:
> 
> On Aug 2, 2012, at 5:09 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> 
> > * with old regexp it wasn't reentrant, causing stuff like this:
> >  -LD     = $(CROSS_COMPILE)ld
> >  +LD     = $(CROSS_COMPILE)ld.bfd.bfd
> >  -LDR    = $(CROSS_COMPILE)ldr
> >  +LDR    = $(CROSS_COMPILE)ld.bfd.bfdr
> >  when do_compile was reexecuted, also breaking LDR variable and
> >  http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch
> >  when it was used together with u-boot.inc from oe-core (meta-ti is using own u-boot.inc)
> > 
> > * This patch is also better solution to ld-is-gold problem then regexp in metadata.
> 
> It would be rather beneficial to import the u-boot patch to accommodate gold from meta-ti
> this helps in creating a uniform solution to same problem. u-boot patch should be upstreamed too.

Then upstream it :)

> 
> > 
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > meta/recipes-bsp/u-boot/u-boot.inc |    2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
> > index 42bdde9..a8642f0 100644
> > --- a/meta/recipes-bsp/u-boot/u-boot.inc
> > +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> > @@ -34,7 +34,7 @@ SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"
> > 
> > do_compile () {
> > 	if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
> > -		sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' config.mk
> > +		sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk
> > 	fi
> > 
> > 	unset LDFLAGS
> > -- 
> > 1.7.8.6
> > 
> > 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: u-boot do_compile should be reentrant even with ld-is-gold

[Otavio Salvador]

On Thu, Aug 2, 2012 at 11:37 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> One character change in that regexp fixed all use-cases I can think of,
> so looks like best solution to me..

+1

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [PATCH] u-boot.inc: fix regexp used when ld-is-gold

[Otavio Salvador]

On Thu, Aug 2, 2012 at 11:32 AM, Khem Raj <raj.khem@gmail.com> wrote:
> It would be rather beneficial to import the u-boot patch to accommodate gold from meta-ti
> this helps in creating a uniform solution to same problem. u-boot patch should be upstreamed too.

I'll port this patch to U-Boot master and send it for inclusion.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br