summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/build.py8
-rw-r--r--bitbake/lib/bb/cache.py6
2 files changed, 4 insertions, 10 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index 22428a649c..8852209938 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -582,10 +582,10 @@ def stamp_internal(taskname, d, file_name, baseonly=False):
582 taskflagname = taskname.replace("_setscene", "") 582 taskflagname = taskname.replace("_setscene", "")
583 583
584 if file_name: 584 if file_name:
585 stamp = d.stamp_base[file_name].get(taskflagname) or d.stamp[file_name] 585 stamp = d.stamp[file_name]
586 extrainfo = d.stamp_extrainfo[file_name].get(taskflagname) or "" 586 extrainfo = d.stamp_extrainfo[file_name].get(taskflagname) or ""
587 else: 587 else:
588 stamp = d.getVarFlag(taskflagname, 'stamp-base', True) or d.getVar('STAMP', True) 588 stamp = d.getVar('STAMP', True)
589 file_name = d.getVar('BB_FILENAME', True) 589 file_name = d.getVar('BB_FILENAME', True)
590 extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or "" 590 extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or ""
591 591
@@ -616,10 +616,10 @@ def stamp_cleanmask_internal(taskname, d, file_name):
616 taskflagname = taskname.replace("_setscene", "") 616 taskflagname = taskname.replace("_setscene", "")
617 617
618 if file_name: 618 if file_name:
619 stamp = d.stamp_base_clean[file_name].get(taskflagname) or d.stampclean[file_name] 619 stamp = d.stampclean[file_name]
620 extrainfo = d.stamp_extrainfo[file_name].get(taskflagname) or "" 620 extrainfo = d.stamp_extrainfo[file_name].get(taskflagname) or ""
621 else: 621 else:
622 stamp = d.getVarFlag(taskflagname, 'stamp-base-clean', True) or d.getVar('STAMPCLEAN', True) 622 stamp = d.getVar('STAMPCLEAN', True)
623 file_name = d.getVar('BB_FILENAME', True) 623 file_name = d.getVar('BB_FILENAME', True)
624 extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or "" 624 extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or ""
625 625
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 521f758282..10b0853a1d 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -129,8 +129,6 @@ class CoreRecipeInfo(RecipeInfoCommon):
129 self.not_world = self.getvar('EXCLUDE_FROM_WORLD', metadata) 129 self.not_world = self.getvar('EXCLUDE_FROM_WORLD', metadata)
130 self.stamp = self.getvar('STAMP', metadata) 130 self.stamp = self.getvar('STAMP', metadata)
131 self.stampclean = self.getvar('STAMPCLEAN', metadata) 131 self.stampclean = self.getvar('STAMPCLEAN', metadata)
132 self.stamp_base = self.flaglist('stamp-base', self.tasks, metadata)
133 self.stamp_base_clean = self.flaglist('stamp-base-clean', self.tasks, metadata)
134 self.stamp_extrainfo = self.flaglist('stamp-extra-info', self.tasks, metadata) 132 self.stamp_extrainfo = self.flaglist('stamp-extra-info', self.tasks, metadata)
135 self.file_checksums = self.flaglist('file-checksums', self.tasks, metadata, True) 133 self.file_checksums = self.flaglist('file-checksums', self.tasks, metadata, True)
136 self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata) 134 self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata)
@@ -158,8 +156,6 @@ class CoreRecipeInfo(RecipeInfoCommon):
158 156
159 cachedata.stamp = {} 157 cachedata.stamp = {}
160 cachedata.stampclean = {} 158 cachedata.stampclean = {}
161 cachedata.stamp_base = {}
162 cachedata.stamp_base_clean = {}
163 cachedata.stamp_extrainfo = {} 159 cachedata.stamp_extrainfo = {}
164 cachedata.file_checksums = {} 160 cachedata.file_checksums = {}
165 cachedata.fn_provides = {} 161 cachedata.fn_provides = {}
@@ -192,8 +188,6 @@ class CoreRecipeInfo(RecipeInfoCommon):
192 cachedata.pkg_dp[fn] = self.defaultpref 188 cachedata.pkg_dp[fn] = self.defaultpref
193 cachedata.stamp[fn] = self.stamp 189 cachedata.stamp[fn] = self.stamp
194 cachedata.stampclean[fn] = self.stampclean 190 cachedata.stampclean[fn] = self.stampclean
195 cachedata.stamp_base[fn] = self.stamp_base
196 cachedata.stamp_base_clean[fn] = self.stamp_base_clean
197 cachedata.stamp_extrainfo[fn] = self.stamp_extrainfo 191 cachedata.stamp_extrainfo[fn] = self.stamp_extrainfo
198 cachedata.file_checksums[fn] = self.file_checksums 192 cachedata.file_checksums[fn] = self.file_checksums
199 193