summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-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 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
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 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"
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 \