[PATCH 0/1] siggen.py: Use basehash if no taskhash

[PATCH 0/1] siggen.py: Use basehash if no taskhash

[Robert Yang]

The following changes since commit a439d32dd843d10a9f65cc858b02422fac7deb50:

  soc-family.inc: to be included in machine.conf to add SOC_FAMILY to MACHINEOVERRIDE (2012-03-04 05:41:11 -0800)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib robert/basehash
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/basehash

Robert Yang (1):
  siggen.py: Use basehash if no taskhash

 bitbake/lib/bb/siggen.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

-- 
1.7.4.1

[PATCH 1/1] siggen.py: Use basehash if no taskhash

[Robert Yang]

The bitbake-runtask doesn't work since there is no taskhash (it worked
in the past, but seems recent changes made it doesn't work again), use
the basehash when there is no taskhash, just like what dump_sigtask
does.

[YOCTO #1229]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 bitbake/lib/bb/siggen.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 975ae41..39f44a2 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -219,7 +219,11 @@ class SignatureGeneratorBasicHash(SignatureGeneratorBasic):
             k = fn + "." + taskname[:-9]
         else:
             k = fn + "." + taskname
-        h = self.taskhash[k]
+        if k in self.taskhash:
+            h = self.taskhash[k]
+        else:
+            # If k is not in basehash, then error
+            h = self.basehash[k]
         return ("%s.%s.%s.%s" % (stampbase, taskname, h, extrainfo)).rstrip('.')
 
 def dump_this_task(outfile, d):
-- 
1.7.4.1

Re: [PATCH 1/1] siggen.py: Use basehash if no taskhash

[Richard Purdie]

On Tue, 2012-03-06 at 14:04 +0800, Robert Yang wrote:
> The bitbake-runtask doesn't work since there is no taskhash (it worked
> in the past, but seems recent changes made it doesn't work again), use
> the basehash when there is no taskhash, just like what dump_sigtask
> does.
> 
> [YOCTO #1229]
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  bitbake/lib/bb/siggen.py |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard