Patchwork Immediately append TCLIBCAPPEND to TMPDIR in defaultsetup.conf

login
register
mail settings
Submitter dlazzari
Date Aug. 3, 2011, 9:54 p.m.
Message ID <359B10B9B28B294BAA6405D9320312E0111E934067@naemmail08.na.leapfrog.com>
Download mbox | patch
Permalink /patch/9277/
State New, archived
Headers show

Comments

dlazzari - Aug. 3, 2011, 9:54 p.m.
Immediately append TCLIBCAPPEND to TMPDIR in defaultsetup.conf
    instead of lazily appending it with _append. This fixes a bug where
    the wrong cache was cleared when BB_SRCREV_POLICY = "clear".


Signed-off-by: Daniel Lazzari Jr <dlazzari@leapfrog.com>
---
 meta/conf/distro/defaultsetup.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Chris Larson - Aug. 5, 2011, 4:59 a.m.
On Wed, Aug 3, 2011 at 2:54 PM, Daniel Lazzari <dlazzari@leapfrog.com> wrote:
>  Immediately append TCLIBCAPPEND to TMPDIR in defaultsetup.conf
>    instead of lazily appending it with _append. This fixes a bug where
>    the wrong cache was cleared when BB_SRCREV_POLICY = "clear".
>
>
> Signed-off-by: Daniel Lazzari Jr <dlazzari@leapfrog.com>
> ---
>  meta/conf/distro/defaultsetup.conf |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
> index 072f03c..951e5be 100644
> --- a/meta/conf/distro/defaultsetup.conf
> +++ b/meta/conf/distro/defaultsetup.conf
> @@ -14,7 +14,7 @@ require conf/distro/include/tclibc-${TCLIBC}.inc
>
>  # Allow single libc distros to disable this code
>  TCLIBCAPPEND ?= "-${TCLIBC}"
> -TMPDIR_append = "${TCLIBCAPPEND}"
> +TMPDIR := "${TMPDIR}${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))]}"

If all you want is an immediate concatenation, you can use .=. Using
:= like this forces an early expansion of TMPDIR unnecessarily, as far
as I can tell.
Khem Raj - Aug. 5, 2011, 5:19 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/04/2011 09:59 PM, Chris Larson wrote:
> On Wed, Aug 3, 2011 at 2:54 PM, Daniel Lazzari
> <dlazzari@leapfrog.com> wrote:
>> Immediately append TCLIBCAPPEND to TMPDIR in defaultsetup.conf 
>> instead of lazily appending it with _append. This fixes a bug
>> where the wrong cache was cleared when BB_SRCREV_POLICY = "clear".
>> 
>> 
>> Signed-off-by: Daniel Lazzari Jr <dlazzari@leapfrog.com> --- 
>> meta/conf/distro/defaultsetup.conf |    2 +- 1 files changed, 1
>> insertions(+), 1 deletions(-)
>> 
>> diff --git a/meta/conf/distro/defaultsetup.conf
>> b/meta/conf/distro/defaultsetup.conf index 072f03c..951e5be 100644 
>> --- a/meta/conf/distro/defaultsetup.conf +++
>> b/meta/conf/distro/defaultsetup.conf @@ -14,7 +14,7 @@ require
>> conf/distro/include/tclibc-${TCLIBC}.inc
>> 
>> # Allow single libc distros to disable this code TCLIBCAPPEND ?=
>> "-${TCLIBC}" -TMPDIR_append = "${TCLIBCAPPEND}" +TMPDIR :=
>> "${TMPDIR}${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))]}"
> 
> If all you want is an immediate concatenation, you can use .=. Using 
> := like this forces an early expansion of TMPDIR unnecessarily, as
> far as I can tell.

I think you mean TMPDIR .= "${TCLIBCAPPEND}" ?
I think that will work too. I have tested the original patch too and it
has worked ok but .= would be better I think let me try that as well.

- -- 
- -Khem
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk48Jh0ACgkQuwUzVZGdMxT+FwCfcQ38C1x6DlSYtnLIlC0ov2aY
ZHYAn3SfzV483FUFCVdTZX67MJQQBZdw
=bUgM
-----END PGP SIGNATURE-----

Patch

diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index 072f03c..951e5be 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -14,7 +14,7 @@  require conf/distro/include/tclibc-${TCLIBC}.inc
 
 # Allow single libc distros to disable this code
 TCLIBCAPPEND ?= "-${TCLIBC}"
-TMPDIR_append = "${TCLIBCAPPEND}"
+TMPDIR := "${TMPDIR}${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))]}"