Patchwork bitbake: build.py: Add stampdir argument to cached_mtime_noerror

login
register
mail settings
Submitter Andrei Gherzan
Date Aug. 16, 2012, 11:21 a.m.
Message ID <1345116093-5872-1-git-send-email-andrei.gherzan@windriver.com>
Download mbox | patch
Permalink /patch/34701/
State New
Headers show

Comments

Andrei Gherzan - Aug. 16, 2012, 11:21 a.m.
After commit 2718537b4b04eb3d80ab4d74171b58e7b8dd68b8 (bitbake:
build.py: Only execute mkdirhier if stampdir doesn't exist) build
failes as cached_mtime_noerror needs an argument - stamp dir. This
argument was forgotten.

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 bitbake/lib/bb/build.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Richard Purdie - Aug. 16, 2012, 11:28 a.m.
On Thu, 2012-08-16 at 14:21 +0300, Andrei Gherzan wrote:
> After commit 2718537b4b04eb3d80ab4d74171b58e7b8dd68b8 (bitbake:
> build.py: Only execute mkdirhier if stampdir doesn't exist) build
> failes as cached_mtime_noerror needs an argument - stamp dir. This
> argument was forgotten.
> 
> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> ---
>  bitbake/lib/bb/build.py |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
> index d64077e..b484d19 100644
> --- a/bitbake/lib/bb/build.py
> +++ b/bitbake/lib/bb/build.py
> @@ -465,7 +465,7 @@ def stamp_internal(taskname, d, file_name):
>      stamp = bb.parse.siggen.stampfile(stamp, file_name, taskname, extrainfo)
>  
>      stampdir = os.path.dirname(stamp)
> -    if bb.parse.cached_mtime_noerror == 0:
> +    if bb.parse.cached_mtime_noerror(stampdir) == 0:
>          bb.utils.mkdirhier(stampdir)
>  
>      return stamp

I suspect I'd fixed this locally but pushed an old version. I've merged
this, thanks.

Richard

Patch

diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index d64077e..b484d19 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -465,7 +465,7 @@  def stamp_internal(taskname, d, file_name):
     stamp = bb.parse.siggen.stampfile(stamp, file_name, taskname, extrainfo)
 
     stampdir = os.path.dirname(stamp)
-    if bb.parse.cached_mtime_noerror == 0:
+    if bb.parse.cached_mtime_noerror(stampdir) == 0:
         bb.utils.mkdirhier(stampdir)
 
     return stamp