distro/defaultsetup.conf: Append TCLIBC to TMPDIR by default

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.

(From OE-Core rev: f2528db8f466a21ca207b310fffa7b05884b4579)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 4 insertions, 6 deletions

diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index 9f12f4da11..072f03c902 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -12,6 +12,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))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}"
 
 USER_CLASSES ?= ""
diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
index 27f6ec672e..83418d6677 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 \