Patchwork [0/6] RFC Distro config changes

login
register
mail settings
Submitter Khem Raj
Date May 15, 2011, 9:34 p.m.
Message ID <20110515213403.GB24670@sakrah.homelinux.org>
Download mbox | patch
Permalink /patch/4093/
State New, archived
Headers show

Comments

Khem Raj - May 15, 2011, 9:34 p.m.
On (15/05/11 13:22), Khem Raj wrote:
> On Wed, May 11, 2011 at 2:45 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > On Tue, 2011-05-10 at 17:58 +0200, Koen Kooi wrote:
> > +DEPLOY_DIR_append = "-uclibc"
> > +STAGING_DIR_TARGET_append = "-uclibc"
> > +STAGING_DIR_HOST_append = "-uclibc"
> > +SSTATE_MANIFESTS_append = "-uclibc"
> >
> 
> this wont work. Since virtclasses empty out some of these vars e.g. native
> resets STAGING_DIR_HOST but this will still append -uclibc to it since append
> happens at the end

Something like below can serve us better

Patch

--- a/meta/conf/distro/include/tclibc-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -21,10 +21,10 @@  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"
-SSTATE_MANIFESTS_append = "-uclibc"
+DEPLOY_DIR_append = "${@["-uclibc", ""][oe.utils.inherits(d, 'native', 'nativesdk')]}"
+STAGING_DIR_TARGET_append = "${@["-uclibc", ""][oe.utils.inherits(d, 'native', 'nativesdk')]}"
+STAGING_DIR_HOST_append = "${@["-uclibc", ""][oe.utils.inherits(d, 'native', 'nativesdk')]}"
+SSTATE_MANIFESTS_append = "${@["-uclibc", ""][oe.utils.inherits(d, 'native', 'nativesdk')]}"

 LIBC_DEPENDENCIES = "\
     uclibc \