Re: [PATCH v2] Set STAMPCLEAN variable

[Claudius Heine <ch@denx.de>]

[-- Attachment #1.1: Type: text/plain, Size: 2437 bytes --]

Hi Jan,

you probably mean v3.

On 14/08/2019 14.39, Jan Kiszka wrote:
> This ensures that stamp files are cleaned when a task is rebuilt. Not
> providing this pattern likely caused a lot of failures when doing
> partial rebuilds.
> 
> As we are at it, switch do_clean to STAMPCLEAN as well.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta/classes/base.bbclass | 4 ++--
>  meta/conf/bitbake.conf    | 1 +
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index ca80bf8..b6638ca 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -206,8 +206,8 @@ python do_clean() {
>      workdir = d.expand("${WORKDIR}")
>      subprocess.check_call(["sudo", "rm", "-rf", workdir])
>  
> -    stamppath = bb.data.expand(d.getVar('STAMP', False), d)
> -    stampdirs = glob.glob(stamppath + ".*")
> +    stampclean = bb.data.expand(d.getVar('STAMPCLEAN', False), d)
> +    stampdirs = glob.glob(stampclean)
>      subprocess.check_call(["sudo", "rm", "-rf"] + stampdirs)
>  }
>  
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 3d18223..ee86ee0 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -36,6 +36,7 @@ S = "${WORKDIR}/${P}"
>  AUTOREV = "${@bb.fetch2.get_autorev(d)}"
>  SRC_URI = "file://${FILE}"
>  STAMP = "${TMPDIR}/stamps/${PF}"
> +STAMPCLEAN = "${TMPDIR}/stamps/${PN}-*"

What I did come across when looking at the commit messages of OE was,
that they used to have all stamps in just one directory. They changed
that, because they and problems when a recipe name 'recipe-1.2.3'
removing stamps from a recipe named 'recipe-name-4.5.6'.

Maybe we should really copy what current OE upstream does.

Like this:

  STAMPS_DIR ?= "${TMPDIR}/stamps"
  STAMP = "${STAMPS_DIR}/${PN}/${PV}-${PR}"
  STAMPCLEAN = "${STAMPS_DIR}/${PN}/*-*"

kind regards,
Claudius

>  SVNDIR = "${DL_DIR}/svn"
>  T = "${WORKDIR}/temp"
>  TMPDIR = "${TOPDIR}/tmp"
> 

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de

           PGP key: 6FF2 E59F 00C6 BC28 31D8 64C1 1173 CB19 9808 B153
                             Keyserver: hkp://pool.sks-keyservers.net


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 850 bytes --]