Patchwork [bitbake-devel,1/1] bitbake.conf: add BB_STAMPS_DIR for constructing STAMP

login
register
mail settings
Submitter Robert Yang
Date Aug. 10, 2012, 2:02 a.m.
Message ID <86c6fef246be4e70f22d24754abbc920470d5997.1344564039.git.liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/34149/
State New
Headers show

Comments

Robert Yang - Aug. 10, 2012, 2:02 a.m.
Add BB_STAMPS_DIR for constructing STAMP, the defination of STAMP
before:

STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}

We can only change the TMPDIR if we want to change the STAMP's location,
but the cache would be regenerated if TMPDIR changed, so add
BB_STAMPS_DIR for constructing it, and add it to the BB_ENV_EXTRAWHITE,
this is very usefull for the "bitbake -S", since then it can be run by:

BB_STAMPS_DIR=<path> bitbake -S <recipe>

which will avoid putting the stamps to ${TMPDIR}/stamps.

BTW, break the too long BB_ENV_EXTRAWHITE into several lines.

[YOCTO #1659]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/conf/bitbake.conf       | 3 ++-
 scripts/oe-buildenv-internal | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
Richard Purdie - Aug. 15, 2012, 1:42 p.m.
On Fri, 2012-08-10 at 10:02 +0800, Robert Yang wrote:
> Add BB_STAMPS_DIR for constructing STAMP, the defination of STAMP
> before:
> 
> STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}
> 
> We can only change the TMPDIR if we want to change the STAMP's location,
> but the cache would be regenerated if TMPDIR changed, so add
> BB_STAMPS_DIR for constructing it, and add it to the BB_ENV_EXTRAWHITE,
> this is very usefull for the "bitbake -S", since then it can be run by:
> 
> BB_STAMPS_DIR=<path> bitbake -S <recipe>
> 
> which will avoid putting the stamps to ${TMPDIR}/stamps.
> 
> BTW, break the too long BB_ENV_EXTRAWHITE into several lines.
> 
> [YOCTO #1659]
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  meta/conf/bitbake.conf       | 3 ++-
>  scripts/oe-buildenv-internal | 5 ++++-
>  2 files changed, 6 insertions(+), 2 deletions(-)

BB_ is a prefix for variables bitbake specifically uses for
configuration. It doesn't fit in this context since its metadata defined
and doesn't actually influence or is used by bitbake itself.

We therefore need to use a different name for this.

Cheers,

Richard
Robert Yang - Aug. 15, 2012, 1:49 p.m.
On 08/15/2012 09:42 PM, Richard Purdie wrote:
> On Fri, 2012-08-10 at 10:02 +0800, Robert Yang wrote:
>> Add BB_STAMPS_DIR for constructing STAMP, the defination of STAMP
>> before:
>>
>> STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}
>>
>> We can only change the TMPDIR if we want to change the STAMP's location,
>> but the cache would be regenerated if TMPDIR changed, so add
>> BB_STAMPS_DIR for constructing it, and add it to the BB_ENV_EXTRAWHITE,
>> this is very usefull for the "bitbake -S", since then it can be run by:
>>
>> BB_STAMPS_DIR=<path> bitbake -S <recipe>
>>
>> which will avoid putting the stamps to ${TMPDIR}/stamps.
>>
>> BTW, break the too long BB_ENV_EXTRAWHITE into several lines.
>>
>> [YOCTO #1659]
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>   meta/conf/bitbake.conf       | 3 ++-
>>   scripts/oe-buildenv-internal | 5 ++++-
>>   2 files changed, 6 insertions(+), 2 deletions(-)
>
> BB_ is a prefix for variables bitbake specifically uses for
> configuration. It doesn't fit in this context since its metadata defined
> and doesn't actually influence or is used by bitbake itself.
>
> We therefore need to use a different name for this.
>

Thanks, how about "STAMPS_DIR" ? And can we put the bitbake-whatchanged
to bitbake/bin or bitbake/contrib as Chris Larson worried about ?

// Robert

> Cheers,
>
> Richard
>
>
>
Richard Purdie - Aug. 15, 2012, 2 p.m.
On Wed, 2012-08-15 at 21:49 +0800, Robert Yang wrote:
> 
> On 08/15/2012 09:42 PM, Richard Purdie wrote:
> > On Fri, 2012-08-10 at 10:02 +0800, Robert Yang wrote:
> >> Add BB_STAMPS_DIR for constructing STAMP, the defination of STAMP
> >> before:
> >>
> >> STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}
> >>
> >> We can only change the TMPDIR if we want to change the STAMP's location,
> >> but the cache would be regenerated if TMPDIR changed, so add
> >> BB_STAMPS_DIR for constructing it, and add it to the BB_ENV_EXTRAWHITE,
> >> this is very usefull for the "bitbake -S", since then it can be run by:
> >>
> >> BB_STAMPS_DIR=<path> bitbake -S <recipe>
> >>
> >> which will avoid putting the stamps to ${TMPDIR}/stamps.
> >>
> >> BTW, break the too long BB_ENV_EXTRAWHITE into several lines.
> >>
> >> [YOCTO #1659]
> >>
> >> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> >> ---
> >>   meta/conf/bitbake.conf       | 3 ++-
> >>   scripts/oe-buildenv-internal | 5 ++++-
> >>   2 files changed, 6 insertions(+), 2 deletions(-)
> >
> > BB_ is a prefix for variables bitbake specifically uses for
> > configuration. It doesn't fit in this context since its metadata defined
> > and doesn't actually influence or is used by bitbake itself.
> >
> > We therefore need to use a different name for this.
> >
> 
> Thanks, how about "STAMPS_DIR" ? And can we put the bitbake-whatchanged
> to bitbake/bin or bitbake/contrib as Chris Larson worried about ?

He's right, it depends on the metadata and therefore shouldn't really be
in bitbake. It could go into scripts/ in oe-core.

Cheers,

Richard
Robert Yang - Aug. 15, 2012, 2:13 p.m.
On 08/15/2012 10:00 PM, Richard Purdie wrote:
> On Wed, 2012-08-15 at 21:49 +0800, Robert Yang wrote:
>>
>> On 08/15/2012 09:42 PM, Richard Purdie wrote:
>>> On Fri, 2012-08-10 at 10:02 +0800, Robert Yang wrote:
>>>> Add BB_STAMPS_DIR for constructing STAMP, the defination of STAMP
>>>> before:
>>>>
>>>> STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}
>>>>
>>>> We can only change the TMPDIR if we want to change the STAMP's location,
>>>> but the cache would be regenerated if TMPDIR changed, so add
>>>> BB_STAMPS_DIR for constructing it, and add it to the BB_ENV_EXTRAWHITE,
>>>> this is very usefull for the "bitbake -S", since then it can be run by:
>>>>
>>>> BB_STAMPS_DIR=<path> bitbake -S <recipe>
>>>>
>>>> which will avoid putting the stamps to ${TMPDIR}/stamps.
>>>>
>>>> BTW, break the too long BB_ENV_EXTRAWHITE into several lines.
>>>>
>>>> [YOCTO #1659]
>>>>
>>>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>>> ---
>>>>    meta/conf/bitbake.conf       | 3 ++-
>>>>    scripts/oe-buildenv-internal | 5 ++++-
>>>>    2 files changed, 6 insertions(+), 2 deletions(-)
>>>
>>> BB_ is a prefix for variables bitbake specifically uses for
>>> configuration. It doesn't fit in this context since its metadata defined
>>> and doesn't actually influence or is used by bitbake itself.
>>>
>>> We therefore need to use a different name for this.
>>>
>>
>> Thanks, how about "STAMPS_DIR" ? And can we put the bitbake-whatchanged
>> to bitbake/bin or bitbake/contrib as Chris Larson worried about ?
>
> He's right, it depends on the metadata and therefore shouldn't really be
> in bitbake. It could go into scripts/ in oe-core.
>

Thanks, I will send a V3 to oe-core list.

// Robert

> Cheers,
>
> Richard
>
>
>

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d5a43e9..8440e65 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -332,7 +332,8 @@  GITDIR = "${CO_DIR}/git2"
 BZRDIR = "${CO_DIR}/bzr"
 HGDIR = "${CO_DIR}/hg"
 
-STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}"
+BB_STAMPS_DIR ?= "${TMPDIR}/stamps"
+STAMP = "${BB_STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PF}"
 WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}"
 T = "${WORKDIR}/temp"
 D = "${WORKDIR}/image"
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 32c0ba0..2674ff7 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -75,4 +75,7 @@  unset BITBAKEDIR
 # Used by the runqemu script
 export BUILDDIR
 export PATH
-export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER SCREENDIR"
+export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy
+    https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY
+    SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE
+    SOCKS5_PASSWD SOCKS5_USER SCREENDIR BB_STAMPS_DIR"