summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 10:48:29 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-19 22:49:54 (GMT)
commit624263c82d1dabb55862a6532a2df2b8a4b541dc (patch)
treec50de744d2f7ee742ebf3276f492de56b04df728
parent09862c423921e5272dedba111e0b6057dcd37d12 (diff)
downloadpoky-624263c82d1dabb55862a6532a2df2b8a4b541dc.tar.gz
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>
-rw-r--r--meta/conf/distro/defaultsetup.conf4
-rw-r--r--meta/conf/distro/include/tclibc-uclibc.inc6
2 files changed, 4 insertions, 6 deletions
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index 9f12f4d..072f03c 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -12,6 +12,10 @@ require conf/distro/include/tcmode-${TCMODE}.inc
12TCLIBC ?= "eglibc" 12TCLIBC ?= "eglibc"
13require conf/distro/include/tclibc-${TCLIBC}.inc 13require conf/distro/include/tclibc-${TCLIBC}.inc
14 14
15# Allow single libc distros to disable this code
16TCLIBCAPPEND ?= "-${TCLIBC}"
17TMPDIR_append = "${TCLIBCAPPEND}"
18
15CACHE = "${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))]}" 19CACHE = "${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))]}"
16 20
17USER_CLASSES ?= "" 21USER_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"
20 20
21IMAGE_LINGUAS = "" 21IMAGE_LINGUAS = ""
22 22
23DEPLOY_DIR_IMAGE = "${TMPDIR}/deploy/images"
24DEPLOY_DIR_append = "-uclibc"
25STAGING_DIR_TARGET_append = "-uclibc"
26STAGING_DIR_HOST_append = "-uclibc"
27SSTATE_MANIFESTS_append = "-uclibc"
28
29LIBC_DEPENDENCIES = "\ 23LIBC_DEPENDENCIES = "\
30 uclibc \ 24 uclibc \
31 uclibc-dbg \ 25 uclibc-dbg \