Skip to contentSkip to conversation

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

RFC PATCH In review Richard Purdie 2 participants 2 messages May 17, 2011

lore
Share & tools
lore

Richard Purdie

author
#0 lore raw

RFC PATCH 1/1 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.

Signed-off-by Richard Purdie <[email protected]>
meta/conf/distro/defaultsetup.conf +4 -0
index 8da6c0a..e7636b4 100644
@@ -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 ?= ""
meta/conf/distro/include/tclibc-uclibc.inc +0 -6
index 27f6ec6..83418d6 100644
@@ -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 \
#1 lore raw

Op 17 mei 2011, om 12:08 heeft Richard Purdie het volgende geschreven:

Quoted 23 lines

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 <[email protected]>
meta/conf/distro/defaultsetup.conf +0 -0
index 8da6c0a..e7636b4 100644
@@ -14,6 +14,10 @@ require conf/distro/include/tcmode-${TCMODE}.inc

TCLIBC ?= "eglibc"
require conf/distro/include/tclibc-${TCLIBC}.inc

meta/conf/distro/defaultsetup.conf +4 -0
+# Allow single libc distros to disable this code
+TCLIBCAPPEND ?= "-${TCLIBC}"
+TMPDIR_append = "${TCLIBCAPPEND}"
+
Quoted 1 line

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