Re: [PATCH v2] Set STAMPCLEAN variable

[Jan Kiszka <jan.kiszka@siemens.com>]

On 14.08.19 16:17, [ext] Jan Kiszka wrote:
> On 14.08.19 16:10, Claudius Heine wrote:
>> Hi Jan,
>>
>> you probably mean v3.
> 
> Yes, sorry.
> 
>>
>> 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}/*-*"
> 
> I agree that aligning makes sense, but let's to that on top.
> 
> Jan
> 

This one breaks CI, likely because we over-clean stamps and then race in case of 
parallel builds. Will examine.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux