* [PATCH] distro/defaultsetup.conf: Append TCLIBC to TMPDIR by default
@ 2011-05-17 10:48 Koen Kooi
2011-05-18 16:52 ` Khem Raj
0 siblings, 1 reply; 2+ messages in thread
From: Koen Kooi @ 2011-05-17 10:48 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
---
meta/conf/distro/defaultsetup.conf | 4 ++++
meta/conf/distro/include/tclibc-uclibc.inc | 6 ------
2 files changed, 4 insertions(+), 6 deletions(-)
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))]}${@['', '/' + 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 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 \
--
1.6.6.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] distro/defaultsetup.conf: Append TCLIBC to TMPDIR by default
2011-05-17 10:48 [PATCH] distro/defaultsetup.conf: Append TCLIBC to TMPDIR by default Koen Kooi
@ 2011-05-18 16:52 ` Khem Raj
0 siblings, 0 replies; 2+ messages in thread
From: Khem Raj @ 2011-05-18 16:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, May 17, 2011 at 3:48 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> 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.
So far so good. This patch is working ok except a few niggles
I still get TMPDIR w/o tclibc append created ad it has
[kraj@leto ~/work/newoe/build]
$ ls
. sstate-cache tmp-angstrom_2010_x-eglibc
.. tmp-angstrom_2010_x tmp-angstrom_2010_x-uclibc
[kraj@leto ~/work/newoe/build/tmp-angstrom_2010_x]
$ ls
. .. abi_version cache saved_tmpdir
[kraj@leto ~/work/newoe/build/tmp-angstrom_2010_x/cache]
$ ls
. .. bb_codeparser.dat bb_persist_data.sqlite3
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/conf/distro/defaultsetup.conf | 4 ++++
> meta/conf/distro/include/tclibc-uclibc.inc | 6 ------
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
> 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))]}${@['', '/' + 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 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 \
> --
> 1.6.6.1
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-18 17:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-17 10:48 [PATCH] distro/defaultsetup.conf: Append TCLIBC to TMPDIR by default Koen Kooi
2011-05-18 16:52 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.