diff options
Diffstat (limited to 'bitbake/lib/bb/siggen.py')
-rw-r--r-- | bitbake/lib/bb/siggen.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index c1685a9e46..fa8a6b1623 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -13,7 +13,7 @@ def init(d): | |||
13 | siggens = [obj for obj in globals().values() | 13 | siggens = [obj for obj in globals().values() |
14 | if type(obj) is type and issubclass(obj, SignatureGenerator)] | 14 | if type(obj) is type and issubclass(obj, SignatureGenerator)] |
15 | 15 | ||
16 | desired = d.getVar("BB_SIGNATURE_HANDLER", True) or "noop" | 16 | desired = d.getVar("BB_SIGNATURE_HANDLER") or "noop" |
17 | for sg in siggens: | 17 | for sg in siggens: |
18 | if desired == sg.name: | 18 | if desired == sg.name: |
19 | return sg(d) | 19 | return sg(d) |
@@ -82,10 +82,10 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
82 | self.gendeps = {} | 82 | self.gendeps = {} |
83 | self.lookupcache = {} | 83 | self.lookupcache = {} |
84 | self.pkgnameextract = re.compile("(?P<fn>.*)\..*") | 84 | self.pkgnameextract = re.compile("(?P<fn>.*)\..*") |
85 | self.basewhitelist = set((data.getVar("BB_HASHBASE_WHITELIST", True) or "").split()) | 85 | self.basewhitelist = set((data.getVar("BB_HASHBASE_WHITELIST") or "").split()) |
86 | self.taskwhitelist = None | 86 | self.taskwhitelist = None |
87 | self.init_rundepcheck(data) | 87 | self.init_rundepcheck(data) |
88 | checksum_cache_file = data.getVar("BB_HASH_CHECKSUM_CACHE_FILE", True) | 88 | checksum_cache_file = data.getVar("BB_HASH_CHECKSUM_CACHE_FILE") |
89 | if checksum_cache_file: | 89 | if checksum_cache_file: |
90 | self.checksum_cache = FileChecksumCache() | 90 | self.checksum_cache = FileChecksumCache() |
91 | self.checksum_cache.init_cache(data, checksum_cache_file) | 91 | self.checksum_cache.init_cache(data, checksum_cache_file) |
@@ -93,7 +93,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
93 | self.checksum_cache = None | 93 | self.checksum_cache = None |
94 | 94 | ||
95 | def init_rundepcheck(self, data): | 95 | def init_rundepcheck(self, data): |
96 | self.taskwhitelist = data.getVar("BB_HASHTASK_WHITELIST", True) or None | 96 | self.taskwhitelist = data.getVar("BB_HASHTASK_WHITELIST") or None |
97 | if self.taskwhitelist: | 97 | if self.taskwhitelist: |
98 | self.twl = re.compile(self.taskwhitelist) | 98 | self.twl = re.compile(self.taskwhitelist) |
99 | else: | 99 | else: |
@@ -160,7 +160,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
160 | 160 | ||
161 | #Slow but can be useful for debugging mismatched basehashes | 161 | #Slow but can be useful for debugging mismatched basehashes |
162 | #for task in self.taskdeps[fn]: | 162 | #for task in self.taskdeps[fn]: |
163 | # self.dump_sigtask(fn, task, d.getVar("STAMP", True), False) | 163 | # self.dump_sigtask(fn, task, d.getVar("STAMP"), False) |
164 | 164 | ||
165 | for task in taskdeps: | 165 | for task in taskdeps: |
166 | d.setVar("BB_BASEHASH_task-%s" % task, self.basehash[fn + "." + task]) | 166 | d.setVar("BB_BASEHASH_task-%s" % task, self.basehash[fn + "." + task]) |
@@ -345,8 +345,8 @@ class SignatureGeneratorBasicHash(SignatureGeneratorBasic): | |||
345 | 345 | ||
346 | def dump_this_task(outfile, d): | 346 | def dump_this_task(outfile, d): |
347 | import bb.parse | 347 | import bb.parse |
348 | fn = d.getVar("BB_FILENAME", True) | 348 | fn = d.getVar("BB_FILENAME") |
349 | task = "do_" + d.getVar("BB_CURRENTTASK", True) | 349 | task = "do_" + d.getVar("BB_CURRENTTASK") |
350 | referencestamp = bb.build.stamp_internal(task, d, None, True) | 350 | referencestamp = bb.build.stamp_internal(task, d, None, True) |
351 | bb.parse.siggen.dump_sigtask(fn, task, outfile, "customfile:" + referencestamp) | 351 | bb.parse.siggen.dump_sigtask(fn, task, outfile, "customfile:" + referencestamp) |
352 | 352 | ||