diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-10 11:42:45 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-11 23:21:27 +0000 |
commit | f329142a31f8207240ad93e5c00e9b6bf8dc9745 (patch) | |
tree | 8ab147827cbd0ccc99dc23fc2b7f63d09b6fe31e | |
parent | a40875b7271cc1737cc42b14e185ce4a63662036 (diff) | |
download | poky-f329142a31f8207240ad93e5c00e9b6bf8dc9745.tar.gz |
bitbake: build/siggen/runqueue: Drop do_setscene references
do_setscene was from a different era before our modern setscene
per task code. It hasn't been used for years so remove some old
obsolete references to it.
(Bitbake rev: ef72282298f7c4db74383c23bb0251dd06d3c6d3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/build.py | 6 | ||||
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/siggen.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index db706d0a3a..5ac191647c 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py | |||
@@ -782,7 +782,7 @@ def stamp_internal(taskname, d, file_name, baseonly=False, noextra=False): | |||
782 | When called in task context, d will be a data store, file_name will not be set | 782 | When called in task context, d will be a data store, file_name will not be set |
783 | """ | 783 | """ |
784 | taskflagname = taskname | 784 | taskflagname = taskname |
785 | if taskname.endswith("_setscene") and taskname != "do_setscene": | 785 | if taskname.endswith("_setscene"): |
786 | taskflagname = taskname.replace("_setscene", "") | 786 | taskflagname = taskname.replace("_setscene", "") |
787 | 787 | ||
788 | if file_name: | 788 | if file_name: |
@@ -818,7 +818,7 @@ def stamp_cleanmask_internal(taskname, d, file_name): | |||
818 | When called in task context, d will be a data store, file_name will not be set | 818 | When called in task context, d will be a data store, file_name will not be set |
819 | """ | 819 | """ |
820 | taskflagname = taskname | 820 | taskflagname = taskname |
821 | if taskname.endswith("_setscene") and taskname != "do_setscene": | 821 | if taskname.endswith("_setscene"): |
822 | taskflagname = taskname.replace("_setscene", "") | 822 | taskflagname = taskname.replace("_setscene", "") |
823 | 823 | ||
824 | if file_name: | 824 | if file_name: |
@@ -865,7 +865,7 @@ def make_stamp(task, d, file_name = None): | |||
865 | 865 | ||
866 | # If we're in task context, write out a signature file for each task | 866 | # If we're in task context, write out a signature file for each task |
867 | # as it completes | 867 | # as it completes |
868 | if not task.endswith("_setscene") and task != "do_setscene" and not file_name: | 868 | if not task.endswith("_setscene") and not file_name: |
869 | stampbase = stamp_internal(task, d, None, True) | 869 | stampbase = stamp_internal(task, d, None, True) |
870 | file_name = d.getVar('BB_FILENAME') | 870 | file_name = d.getVar('BB_FILENAME') |
871 | bb.parse.siggen.dump_sigtask(file_name, task, stampbase, True) | 871 | bb.parse.siggen.dump_sigtask(file_name, task, stampbase, True) |
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 7451e5c56b..63cce8184f 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -1408,7 +1408,7 @@ class RunQueue: | |||
1408 | logger.debug2("%s.%s is nostamp\n", fn, taskname) | 1408 | logger.debug2("%s.%s is nostamp\n", fn, taskname) |
1409 | return False | 1409 | return False |
1410 | 1410 | ||
1411 | if taskname != "do_setscene" and taskname.endswith("_setscene"): | 1411 | if taskname.endswith("_setscene"): |
1412 | return True | 1412 | return True |
1413 | 1413 | ||
1414 | if cache is None: | 1414 | if cache is None: |
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index be56b3a31c..cdf7d03a34 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -429,7 +429,7 @@ class SignatureGeneratorBasicHash(SignatureGeneratorBasic): | |||
429 | return self.basehash[tid] | 429 | return self.basehash[tid] |
430 | 430 | ||
431 | def stampfile(self, stampbase, fn, taskname, extrainfo, clean=False): | 431 | def stampfile(self, stampbase, fn, taskname, extrainfo, clean=False): |
432 | if taskname != "do_setscene" and taskname.endswith("_setscene"): | 432 | if taskname.endswith("_setscene"): |
433 | tid = fn + ":" + taskname[:-9] | 433 | tid = fn + ":" + taskname[:-9] |
434 | else: | 434 | else: |
435 | tid = fn + ":" + taskname | 435 | tid = fn + ":" + taskname |