Patchwork [2/2] tclibc-uclibc.inc: Append -uclibc only to target recipes

login
register
mail settings
Submitter Khem Raj
Date May 16, 2011, 6:04 a.m.
Message ID <ca9a918a98510eac991c84ce1ebe8fecbdf38361.1305525725.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/4103/
State New, archived
Headers show

Comments

Khem Raj - May 16, 2011, 6:04 a.m.
Do not define DEPLOY_DIR_IMAGE
Append -uclibc to STAGING_DIR_TARGET only for target recipe and cross
recipes
Append -uclibc to STAGING_DIR_HOST only for target recipes.

These changes make sure that we still share the native sysroot

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/conf/distro/include/tclibc-uclibc.inc |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
Koen Kooi - May 16, 2011, 6:58 a.m.
Op 16 mei 2011, om 08:04 heeft Khem Raj het volgende geschreven:

> Do not define DEPLOY_DIR_IMAGE
> Append -uclibc to STAGING_DIR_TARGET only for target recipe and cross
> recipes
> Append -uclibc to STAGING_DIR_HOST only for target recipes.
> 
> These changes make sure that we still share the native sysroot

I still stay we append tclibc unconditionally.

> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/conf/distro/include/tclibc-uclibc.inc |    5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
> index 27f6ec6..4bd313f 100644
> --- a/meta/conf/distro/include/tclibc-uclibc.inc
> +++ b/meta/conf/distro/include/tclibc-uclibc.inc
> @@ -20,10 +20,9 @@ CXXFLAGS += "-fvisibility-inlines-hidden"
> 
> IMAGE_LINGUAS = ""
> 
> -DEPLOY_DIR_IMAGE = "${TMPDIR}/deploy/images"
> DEPLOY_DIR_append = "-uclibc"
> -STAGING_DIR_TARGET_append = "-uclibc"
> -STAGING_DIR_HOST_append = "-uclibc"
> +STAGING_DIR_TARGET_append = "${@['-uclibc', ''][oe.utils.inherits(d, 'native', 'nativesdk')]}"
> +STAGING_DIR_HOST_append = "${@['-uclibc', ''][oe.utils.inherits(d, 'native', 'nativesdk', 'cross', 'crosssdk')]}"
> SSTATE_MANIFESTS_append = "-uclibc"
> 
> LIBC_DEPENDENCIES = "\
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Khem Raj - May 16, 2011, 9:55 a.m.
On Sun, May 15, 2011 at 11:58 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>
> Op 16 mei 2011, om 08:04 heeft Khem Raj het volgende geschreven:
>
>> Do not define DEPLOY_DIR_IMAGE
>> Append -uclibc to STAGING_DIR_TARGET only for target recipe and cross
>> recipes
>> Append -uclibc to STAGING_DIR_HOST only for target recipes.
>>
>> These changes make sure that we still share the native sysroot
>
> I still stay we append tclibc unconditionally.

yes thats would simplify things if we agree to use TCLIBC in bitbake.conf

>
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> meta/conf/distro/include/tclibc-uclibc.inc |    5 ++---
>> 1 files changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
>> index 27f6ec6..4bd313f 100644
>> --- a/meta/conf/distro/include/tclibc-uclibc.inc
>> +++ b/meta/conf/distro/include/tclibc-uclibc.inc
>> @@ -20,10 +20,9 @@ CXXFLAGS += "-fvisibility-inlines-hidden"
>>
>> IMAGE_LINGUAS = ""
>>
>> -DEPLOY_DIR_IMAGE = "${TMPDIR}/deploy/images"
>> DEPLOY_DIR_append = "-uclibc"
>> -STAGING_DIR_TARGET_append = "-uclibc"
>> -STAGING_DIR_HOST_append = "-uclibc"
>> +STAGING_DIR_TARGET_append = "${@['-uclibc', ''][oe.utils.inherits(d, 'native', 'nativesdk')]}"
>> +STAGING_DIR_HOST_append = "${@['-uclibc', ''][oe.utils.inherits(d, 'native', 'nativesdk', 'cross', 'crosssdk')]}"
>> SSTATE_MANIFESTS_append = "-uclibc"
>>
>> LIBC_DEPENDENCIES = "\
>> --
>> 1.7.4.1
>>
>>
>> _______________________________________________
>> 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
>
Richard Purdie - May 16, 2011, 11:41 a.m.
On Mon, 2011-05-16 at 02:55 -0700, Khem Raj wrote:
> On Sun, May 15, 2011 at 11:58 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> >
> > Op 16 mei 2011, om 08:04 heeft Khem Raj het volgende geschreven:
> >
> >> Do not define DEPLOY_DIR_IMAGE
> >> Append -uclibc to STAGING_DIR_TARGET only for target recipe and cross
> >> recipes
> >> Append -uclibc to STAGING_DIR_HOST only for target recipes.
> >>
> >> These changes make sure that we still share the native sysroot
> >
> > I still stay we append tclibc unconditionally.
> 
> yes thats would simplify things if we agree to use TCLIBC in bitbake.conf

We can't depend on TCLIBC in bitbake.conf since someone still has the
option of not using the standard configuration boilerplate we're
providing.

Cheers,

Richard
Koen Kooi - May 16, 2011, 1:11 p.m.
Op 16 mei 2011, om 13:41 heeft Richard Purdie het volgende geschreven:

> On Mon, 2011-05-16 at 02:55 -0700, Khem Raj wrote:
>> On Sun, May 15, 2011 at 11:58 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>> 
>>> Op 16 mei 2011, om 08:04 heeft Khem Raj het volgende geschreven:
>>> 
>>>> Do not define DEPLOY_DIR_IMAGE
>>>> Append -uclibc to STAGING_DIR_TARGET only for target recipe and cross
>>>> recipes
>>>> Append -uclibc to STAGING_DIR_HOST only for target recipes.
>>>> 
>>>> These changes make sure that we still share the native sysroot
>>> 
>>> I still stay we append tclibc unconditionally.
>> 
>> yes thats would simplify things if we agree to use TCLIBC in bitbake.conf
> 
> We can't depend on TCLIBC in bitbake.conf since someone still has the
> option of not using the standard configuration boilerplate we're
> providing.

So we can't add TCLIBC ??= eglibc to bitbake.conf?
Richard Purdie - May 16, 2011, 1:50 p.m.
On Mon, 2011-05-16 at 15:11 +0200, Koen Kooi wrote:
> Op 16 mei 2011, om 13:41 heeft Richard Purdie het volgende geschreven:
> 
> > On Mon, 2011-05-16 at 02:55 -0700, Khem Raj wrote:
> >> On Sun, May 15, 2011 at 11:58 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> >>> 
> >>> Op 16 mei 2011, om 08:04 heeft Khem Raj het volgende geschreven:
> >>> 
> >>>> Do not define DEPLOY_DIR_IMAGE
> >>>> Append -uclibc to STAGING_DIR_TARGET only for target recipe and cross
> >>>> recipes
> >>>> Append -uclibc to STAGING_DIR_HOST only for target recipes.
> >>>> 
> >>>> These changes make sure that we still share the native sysroot
> >>> 
> >>> I still stay we append tclibc unconditionally.
> >> 
> >> yes thats would simplify things if we agree to use TCLIBC in bitbake.conf
> > 
> > We can't depend on TCLIBC in bitbake.conf since someone still has the
> > option of not using the standard configuration boilerplate we're
> > providing.
> 
> So we can't add TCLIBC ??= eglibc to bitbake.conf?

No, I can just see the bug reports for uclibc building in a directory
called XXX-eglibc as the user had only set the PREFERRED_PROVIDER
variables.

Cheers,

Richard
Koen Kooi - May 16, 2011, 3:43 p.m.
Op 16 mei 2011, om 15:50 heeft Richard Purdie het volgende geschreven:

> On Mon, 2011-05-16 at 15:11 +0200, Koen Kooi wrote:
>> Op 16 mei 2011, om 13:41 heeft Richard Purdie het volgende geschreven:
>> 
>>> On Mon, 2011-05-16 at 02:55 -0700, Khem Raj wrote:
>>>> On Sun, May 15, 2011 at 11:58 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>>>> 
>>>>> Op 16 mei 2011, om 08:04 heeft Khem Raj het volgende geschreven:
>>>>> 
>>>>>> Do not define DEPLOY_DIR_IMAGE
>>>>>> Append -uclibc to STAGING_DIR_TARGET only for target recipe and cross
>>>>>> recipes
>>>>>> Append -uclibc to STAGING_DIR_HOST only for target recipes.
>>>>>> 
>>>>>> These changes make sure that we still share the native sysroot
>>>>> 
>>>>> I still stay we append tclibc unconditionally.
>>>> 
>>>> yes thats would simplify things if we agree to use TCLIBC in bitbake.conf
>>> 
>>> We can't depend on TCLIBC in bitbake.conf since someone still has the
>>> option of not using the standard configuration boilerplate we're
>>> providing.
>> 
>> So we can't add TCLIBC ??= eglibc to bitbake.conf?
> 
> No, I can just see the bug reports for uclibc building in a directory
> called XXX-eglibc as the user had only set the PREFERRED_PROVIDER
> variables.

Do you really care about such usecases? Someone who thinks he is too smart to use the includes can 'fix' the paths himself, no?

Patch

diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
index 27f6ec6..4bd313f 100644
--- a/meta/conf/distro/include/tclibc-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -20,10 +20,9 @@  CXXFLAGS += "-fvisibility-inlines-hidden"
 
 IMAGE_LINGUAS = ""
 
-DEPLOY_DIR_IMAGE = "${TMPDIR}/deploy/images"
 DEPLOY_DIR_append = "-uclibc"
-STAGING_DIR_TARGET_append = "-uclibc"
-STAGING_DIR_HOST_append = "-uclibc"
+STAGING_DIR_TARGET_append = "${@['-uclibc', ''][oe.utils.inherits(d, 'native', 'nativesdk')]}"
+STAGING_DIR_HOST_append = "${@['-uclibc', ''][oe.utils.inherits(d, 'native', 'nativesdk', 'cross', 'crosssdk')]}"
 SSTATE_MANIFESTS_append = "-uclibc"
 
 LIBC_DEPENDENCIES = "\