Patchwork [RFC] distro/defaultsetup.conf: Append TCLIBC to TMPDIR by default

login
register
mail settings
Submitter Richard Purdie
Date May 17, 2011, 10:08 a.m.
Message ID <1305626898.3424.223.camel@rex>
Download mbox | patch
Permalink /patch/4225/
State New, archived
Headers show

Comments

Richard Purdie - May 17, 2011, 10:08 a.m.
The current solutions to share uclibc, eglibc and glibc builds in the
same tree all have various issues associated with them. Appending the
suffix to TMPDIR seems like the best solution since sstate (which
defaults to outside TMPDIR) will allow reuse of any components.

This avoids messy changes to the core with other approaches to this
problem inevitably entail, usually in code where this abstraction isn;'t
logically best placed.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Koen Kooi - May 17, 2011, 10:55 a.m.
Op 17 mei 2011, om 12:08 heeft Richard Purdie het volgende geschreven:

> The current solutions to share uclibc, eglibc and glibc builds in the
> same tree all have various issues associated with them. Appending the
> suffix to TMPDIR seems like the best solution since sstate (which
> defaults to outside TMPDIR) will allow reuse of any components.
> 
> This avoids messy changes to the core with other approaches to this
> problem inevitably entail, usually in code where this abstraction isn;'t
> logically best placed.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> 
> diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
> index 8da6c0a..e7636b4 100644
> --- a/meta/conf/distro/defaultsetup.conf
> +++ b/meta/conf/distro/defaultsetup.conf
> @@ -14,6 +14,10 @@ require conf/distro/include/tcmode-${TCMODE}.inc
> TCLIBC ?= "eglibc"
> require conf/distro/include/tclibc-${TCLIBC}.inc
> 
> +# Allow single libc distros to disable this code
> +TCLIBCAPPEND ?= "-${TCLIBC}"
> +TMPDIR_append = "${TCLIBCAPPEND}"
> +
> CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))

The line above has whitespace damage, I rediffed it and sent it to this list so people don't have to manually fix the patch

Patch

diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index 8da6c0a..e7636b4 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -14,6 +14,10 @@  require conf/distro/include/tcmode-${TCMODE}.inc
 TCLIBC ?= "eglibc"
 require conf/distro/include/tclibc-${TCLIBC}.inc
 
+# Allow single libc distros to disable this code
+TCLIBCAPPEND ?= "-${TCLIBC}"
+TMPDIR_append = "${TCLIBCAPPEND}"
+
 CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))
 
 USER_CLASSES ?= ""
diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
index 27f6ec6..83418d6 100644
--- a/meta/conf/distro/include/tclibc-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -20,12 +20,6 @@  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"
-
 LIBC_DEPENDENCIES = "\
     uclibc \
     uclibc-dbg \