diff options
| -rw-r--r-- | bitbake/lib/bb/build.py | 8 | ||||
| -rw-r--r-- | bitbake/lib/bb/cache.py | 6 |
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): taskflagname = taskname.replace("_setscene", "") if file_name: - stamp = d.stamp_base[file_name].get(taskflagname) or d.stamp[file_name] + stamp = d.stamp[file_name] extrainfo = d.stamp_extrainfo[file_name].get(taskflagname) or "" else: - stamp = d.getVarFlag(taskflagname, 'stamp-base', True) or d.getVar('STAMP', True) + stamp = d.getVar('STAMP', True) file_name = d.getVar('BB_FILENAME', True) extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or "" @@ -616,10 +616,10 @@ def stamp_cleanmask_internal(taskname, d, file_name): taskflagname = taskname.replace("_setscene", "") if file_name: - stamp = d.stamp_base_clean[file_name].get(taskflagname) or d.stampclean[file_name] + stamp = d.stampclean[file_name] extrainfo = d.stamp_extrainfo[file_name].get(taskflagname) or "" else: - stamp = d.getVarFlag(taskflagname, 'stamp-base-clean', True) or d.getVar('STAMPCLEAN', True) + stamp = d.getVar('STAMPCLEAN', True) file_name = d.getVar('BB_FILENAME', True) extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or "" 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): self.not_world = self.getvar('EXCLUDE_FROM_WORLD', metadata) self.stamp = self.getvar('STAMP', metadata) self.stampclean = self.getvar('STAMPCLEAN', metadata) - self.stamp_base = self.flaglist('stamp-base', self.tasks, metadata) - self.stamp_base_clean = self.flaglist('stamp-base-clean', self.tasks, metadata) self.stamp_extrainfo = self.flaglist('stamp-extra-info', self.tasks, metadata) self.file_checksums = self.flaglist('file-checksums', self.tasks, metadata, True) self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata) @@ -158,8 +156,6 @@ class CoreRecipeInfo(RecipeInfoCommon): cachedata.stamp = {} cachedata.stampclean = {} - cachedata.stamp_base = {} - cachedata.stamp_base_clean = {} cachedata.stamp_extrainfo = {} cachedata.file_checksums = {} cachedata.fn_provides = {} @@ -192,8 +188,6 @@ class CoreRecipeInfo(RecipeInfoCommon): cachedata.pkg_dp[fn] = self.defaultpref cachedata.stamp[fn] = self.stamp cachedata.stampclean[fn] = self.stampclean - cachedata.stamp_base[fn] = self.stamp_base - cachedata.stamp_base_clean[fn] = self.stamp_base_clean cachedata.stamp_extrainfo[fn] = self.stamp_extrainfo cachedata.file_checksums[fn] = self.file_checksums |