Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH] gnu-efi: copy header files for x32 build
@ 2017-04-10 15:58 Saul Wold
  2017-04-10 19:57 ` Khem Raj
  0 siblings, 1 reply; 5+ messages in thread
From: Saul Wold @ 2017-04-10 15:58 UTC (permalink / raw)
  To: openembedded-core, richard.purdie

Gnu-efi needs to be build for 64bit since it is a boot time tool. It
needs these 2 headers to be in 64 bit versions, we can use the existing
32bit ones as there is not really any difference.

[YOCTO #11051]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
index f46381d..6f235b7 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
@@ -24,6 +24,11 @@ SRC_URI[sha256sum] = "bd8fcd5914f18fc0e4ba948ab03b00013e528504f529c60739b748f6ef
 COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
 COMPATIBLE_HOST_armv4 = 'null'
 
+do_configure_linux-gnux32_prepend() {
+	cp ${STAGING_INCDIR}/gnu/stubs-x32.h ${STAGING_INCDIR}/gnu/stubs-64.h
+	cp ${STAGING_INCDIR}/bits/long-double-32.h ${STAGING_INCDIR}/bits/long-double-64.h
+}
+
 def gnu_efi_arch(d):
     import re
     tarch = d.getVar("TARGET_ARCH")
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] gnu-efi: copy header files for x32 build
  2017-04-10 15:58 [PATCH] gnu-efi: copy header files for x32 build Saul Wold
@ 2017-04-10 19:57 ` Khem Raj
  2017-04-10 22:31   ` Saul Wold
  0 siblings, 1 reply; 5+ messages in thread
From: Khem Raj @ 2017-04-10 19:57 UTC (permalink / raw)
  To: Saul Wold, openembedded-core, richard.purdie


[-- Attachment #1.1: Type: text/plain, Size: 1301 bytes --]



On 4/10/17 8:58 AM, Saul Wold wrote:
> Gnu-efi needs to be build for 64bit since it is a boot time tool. It
> needs these 2 headers to be in 64 bit versions, we can use the existing
> 32bit ones as there is not really any difference.
> 
> [YOCTO #11051]
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
> index f46381d..6f235b7 100644
> --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
> +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
> @@ -24,6 +24,11 @@ SRC_URI[sha256sum] = "bd8fcd5914f18fc0e4ba948ab03b00013e528504f529c60739b748f6ef
>  COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
>  COMPATIBLE_HOST_armv4 = 'null'
>  
> +do_configure_linux-gnux32_prepend() {
> +	cp ${STAGING_INCDIR}/gnu/stubs-x32.h ${STAGING_INCDIR}/gnu/stubs-64.h
> +	cp ${STAGING_INCDIR}/bits/long-double-32.h ${STAGING_INCDIR}/bits/long-double-64.h
> +}
> +
making long-double-32.h pretend long-double-64.h seems wrong to me. but
if you were to do that then symlinking might be better

>  def gnu_efi_arch(d):
>      import re
>      tarch = d.getVar("TARGET_ARCH")
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] gnu-efi: copy header files for x32 build
  2017-04-10 19:57 ` Khem Raj
@ 2017-04-10 22:31   ` Saul Wold
  2017-04-10 23:09     ` Richard Purdie
  0 siblings, 1 reply; 5+ messages in thread
From: Saul Wold @ 2017-04-10 22:31 UTC (permalink / raw)
  To: Khem Raj, openembedded-core, richard.purdie

On Mon, 2017-04-10 at 12:57 -0700, Khem Raj wrote:
> 
> On 4/10/17 8:58 AM, Saul Wold wrote:
> > 
> > Gnu-efi needs to be build for 64bit since it is a boot time tool.
> > It
> > needs these 2 headers to be in 64 bit versions, we can use the
> > existing
> > 32bit ones as there is not really any difference.
> > 
> > [YOCTO #11051]
> > 
> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> > ---
> >  meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb | 5 +++++
> >  1 file changed, 5 insertions(+)
> > 
> > diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
> > b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
> > index f46381d..6f235b7 100644
> > --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
> > +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
> > @@ -24,6 +24,11 @@ SRC_URI[sha256sum] =
> > "bd8fcd5914f18fc0e4ba948ab03b00013e528504f529c60739b748f6ef
> >  COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
> >  COMPATIBLE_HOST_armv4 = 'null'
> >  
> > +do_configure_linux-gnux32_prepend() {
> > +	cp ${STAGING_INCDIR}/gnu/stubs-x32.h
> > ${STAGING_INCDIR}/gnu/stubs-64.h
> > +	cp ${STAGING_INCDIR}/bits/long-double-32.h
> > ${STAGING_INCDIR}/bits/long-double-64.h
> > +}
> > +
> making long-double-32.h pretend long-double-64.h seems wrong to me.
> but
> if you were to do that then symlinking might be better
> 
I guess I could symlink it, as it turns out with glibc it's an empty
header file other than boilerplate, I did not check musl, which I guess
I will do now!

Even the stubs file is pretty much the same file.

Sau!

> > 
> >  def gnu_efi_arch(d):
> >      import re
> >      tarch = d.getVar("TARGET_ARCH")
> > 
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] gnu-efi: copy header files for x32 build
  2017-04-10 22:31   ` Saul Wold
@ 2017-04-10 23:09     ` Richard Purdie
  2017-04-10 23:28       ` Khem Raj
  0 siblings, 1 reply; 5+ messages in thread
From: Richard Purdie @ 2017-04-10 23:09 UTC (permalink / raw)
  To: Saul Wold, Khem Raj, openembedded-core

On Mon, 2017-04-10 at 15:31 -0700, Saul Wold wrote:
> On Mon, 2017-04-10 at 12:57 -0700, Khem Raj wrote:
> > 
> > 
> > On 4/10/17 8:58 AM, Saul Wold wrote:
> > > 
> > > 
> > > Gnu-efi needs to be build for 64bit since it is a boot time tool.
> > > It
> > > needs these 2 headers to be in 64 bit versions, we can use the
> > > existing
> > > 32bit ones as there is not really any difference.
> > > 
> > > [YOCTO #11051]
> > > 
> > > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> > > ---
> > >  meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb | 5 +++++
> > >  1 file changed, 5 insertions(+)
> > > 
> > > diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
> > > b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
> > > index f46381d..6f235b7 100644
> > > --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
> > > +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
> > > @@ -24,6 +24,11 @@ SRC_URI[sha256sum] =
> > > "bd8fcd5914f18fc0e4ba948ab03b00013e528504f529c60739b748f6ef
> > >  COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
> > >  COMPATIBLE_HOST_armv4 = 'null'
> > >  
> > > +do_configure_linux-gnux32_prepend() {
> > > +	cp ${STAGING_INCDIR}/gnu/stubs-x32.h
> > > ${STAGING_INCDIR}/gnu/stubs-64.h
> > > +	cp ${STAGING_INCDIR}/bits/long-double-32.h
> > > ${STAGING_INCDIR}/bits/long-double-64.h
> > > +}
> > > +
> > making long-double-32.h pretend long-double-64.h seems wrong to me.
> > but
> > if you were to do that then symlinking might be better
> > 
> I guess I could symlink it, as it turns out with glibc it's an empty
> header file other than boilerplate, I did not check musl, which I
> guess
> I will do now!
> 
> Even the stubs file is pretty much the same file.

FWIW, the copy makes the task re-executable. If you make symlinks, the
code gets a bit more ugly so the task can be re-executed.

Cheers,

Richard


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] gnu-efi: copy header files for x32 build
  2017-04-10 23:09     ` Richard Purdie
@ 2017-04-10 23:28       ` Khem Raj
  0 siblings, 0 replies; 5+ messages in thread
From: Khem Raj @ 2017-04-10 23:28 UTC (permalink / raw)
  To: Richard Purdie, Saul Wold, openembedded-core


[-- Attachment #1.1: Type: text/plain, Size: 1931 bytes --]



On 4/10/17 4:09 PM, Richard Purdie wrote:
> On Mon, 2017-04-10 at 15:31 -0700, Saul Wold wrote:
>> On Mon, 2017-04-10 at 12:57 -0700, Khem Raj wrote:
>>>
>>>
>>> On 4/10/17 8:58 AM, Saul Wold wrote:
>>>>
>>>>
>>>> Gnu-efi needs to be build for 64bit since it is a boot time tool.
>>>> It
>>>> needs these 2 headers to be in 64 bit versions, we can use the
>>>> existing
>>>> 32bit ones as there is not really any difference.
>>>>
>>>> [YOCTO #11051]
>>>>
>>>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>>>> ---
>>>>  meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb | 5 +++++
>>>>  1 file changed, 5 insertions(+)
>>>>
>>>> diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
>>>> b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
>>>> index f46381d..6f235b7 100644
>>>> --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
>>>> +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
>>>> @@ -24,6 +24,11 @@ SRC_URI[sha256sum] =
>>>> "bd8fcd5914f18fc0e4ba948ab03b00013e528504f529c60739b748f6ef
>>>>  COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
>>>>  COMPATIBLE_HOST_armv4 = 'null'
>>>>  
>>>> +do_configure_linux-gnux32_prepend() {
>>>> +	cp ${STAGING_INCDIR}/gnu/stubs-x32.h
>>>> ${STAGING_INCDIR}/gnu/stubs-64.h
>>>> +	cp ${STAGING_INCDIR}/bits/long-double-32.h
>>>> ${STAGING_INCDIR}/bits/long-double-64.h
>>>> +}
>>>> +
>>> making long-double-32.h pretend long-double-64.h seems wrong to me.
>>> but
>>> if you were to do that then symlinking might be better
>>>
>> I guess I could symlink it, as it turns out with glibc it's an empty
>> header file other than boilerplate, I did not check musl, which I
>> guess
>> I will do now!
>>
>> Even the stubs file is pretty much the same file.
> 
> FWIW, the copy makes the task re-executable. If you make symlinks, the
> code gets a bit more ugly so the task can be re-executed.
> 

ln -sf ?

> Cheers,
> 
> Richard
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-04-10 23:28 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-10 15:58 [PATCH] gnu-efi: copy header files for x32 build Saul Wold
2017-04-10 19:57 ` Khem Raj
2017-04-10 22:31   ` Saul Wold
2017-04-10 23:09     ` Richard Purdie
2017-04-10 23:28       ` Khem Raj

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox