[bitbake-devel] [PATCH] bitbake: clean up stamp-base related codes

[Richard Purdie]

On Wed, 2016-01-06 at 16:32 +0800, Chen Qi wrote:
> The 'stamp-base' related codes are no longer useful, clean them up.
> 
> [YOCTO #8468]
> 
> Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
> ---
>  bitbake/lib/bb/build.py | 4 ++--
>  bitbake/lib/bb/cache.py | 3 ---
>  2 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
> index 22428a6..b84338b 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 ""
>  
> diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
> index 521f758..0ec4057 100644
> --- a/bitbake/lib/bb/cache.py
> +++ b/bitbake/lib/bb/cache.py
> @@ -129,7 +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',


Ok, but what about stamp_base_clean?

Cheers,

Richard


> 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)
> @@ -158,7 +157,6 @@ class CoreRecipeInfo(RecipeInfoCommon):
>  
>          cachedata.stamp = {}
>          cachedata.stampclean = {}
> -        cachedata.stamp_base = {}
>          cachedata.stamp_base_clean = {}
>          cachedata.stamp_extrainfo = {}
>          cachedata.file_checksums = {}
> @@ -192,7 +190,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
> -- 
> 1.9.1
>