Patchwork [1/1] sstate.bbclass: remove previous version's stamp

login
register
mail settings
Submitter Robert Yang
Date Jan. 17, 2014, 11:01 a.m.
Message ID <52D90D85.7010106@windriver.com>
Download mbox | patch
Permalink /patch/65059/
State New
Headers show

Comments

Robert Yang - Jan. 17, 2014, 11:01 a.m.
On 01/17/2014 06:36 PM, Richard Purdie wrote:
> On Fri, 2014-01-17 at 14:43 +0800, Robert Yang wrote:
>> +        # Keep the sigdata
>> +        if not re.match(re_sigdata, stfile):
>> +            oe.path.remove(stfile)
>
> I'm not sure its worth the overhead of using regexps here. Can we not do
> something simple like:
>
> if ".sigdata." not in stfile:
>

Sounds better, I've updated the PULL:

git://git.pokylinux.org/poky-contrib rbt/clean_stamp

and here is the patch:

// Robert

> Cheers,
>
> Richard
>
>
>
Richard Purdie - Jan. 17, 2014, 12:17 p.m.
On Fri, 2014-01-17 at 19:01 +0800, Robert Yang wrote:
> 
> On 01/17/2014 06:36 PM, Richard Purdie wrote:
> > On Fri, 2014-01-17 at 14:43 +0800, Robert Yang wrote:
> >> +        # Keep the sigdata
> >> +        if not re.match(re_sigdata, stfile):
> >> +            oe.path.remove(stfile)
> >
> > I'm not sure its worth the overhead of using regexps here. Can we not do
> > something simple like:
> >
> > if ".sigdata." not in stfile:
> >
> 
> Sounds better, I've updated the PULL:
> 
> git://git.pokylinux.org/poky-contrib rbt/clean_stamp
> 
> and here is the patch:
> 
> diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
> index 35c3f85..d4e0dcb 100644
> --- a/meta/classes/sstate.bbclass
> +++ b/meta/classes/sstate.bbclass
> @@ -331,11 +331,17 @@ def sstate_clean_manifest(manifest, d):
> 
>   def sstate_clean(ss, d):
>       import oe.path
> +    import glob
> 
>       d2 = d.createCopy()
> +    stamp_clean = d.getVar("STAMPCLEAN", True)
>       extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True)
>       if extrainf:
>           d2.setVar("SSTATE_MANMACH", extrainf)
> +        wildcard_stfile = "%s.do_%s*.%s" % (stamp_clean, ss['task'], extrainf)
> +    else:
> +        wildcard_stfile = "%s.do_%s*" % (stamp_clean, ss['task'])
> +
>       manifest = d2.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'])
> 
>       if os.path.exists(manifest):
> @@ -350,15 +356,11 @@ def sstate_clean(ss, d):
>           for lock in locks:
>               bb.utils.unlockfile(lock)
> 
> -    stfile = d.getVar("STAMP", True) + ".do_" + ss['task']
> -    oe.path.remove(stfile)
> -    oe.path.remove(stfile + "_setscene")
> -    if extrainf:
> -        oe.path.remove(stfile + ".*" + extrainf)
> -        oe.path.remove(stfile + "_setscene" + ".*" + extrainf)
> -    else:
> -        oe.path.remove(stfile + ".*")
> -        oe.path.remove(stfile + "_setscene" + ".*")
> +    # Remove the current and previous stamps, but keep the sigdata
> +    for stfile in glob.glob(wildcard_stfile):
> +        # Keep the sigdata
> +        if ".sigdata." not in stfile:
> +            oe.path.remove(stfile)

Sorry Robert, there is one more issue here. You're doing "do_%s*" but
this can match multiple tasks, e.g. do_package* would also wipe out
do_package_write_ipk, do_package_write_rpm etc.

The easiest way to handle this is probably in the for loop, making sure
that do_<task>. or do_<task>_setscene. are in the filename.

It might be worth putting some comments in the code about these
subtleties. 

Cheers,

Richard
Robert Yang - Jan. 20, 2014, 9:28 a.m.
On 01/17/2014 08:17 PM, Richard Purdie wrote:
> On Fri, 2014-01-17 at 19:01 +0800, Robert Yang wrote:
>>
>> On 01/17/2014 06:36 PM, Richard Purdie wrote:
>>> On Fri, 2014-01-17 at 14:43 +0800, Robert Yang wrote:
>>>> +        # Keep the sigdata
>>>> +        if not re.match(re_sigdata, stfile):
>>>> +            oe.path.remove(stfile)
>>>
>>> I'm not sure its worth the overhead of using regexps here. Can we not do
>>> something simple like:
>>>
>>> if ".sigdata." not in stfile:
>>>
>>
>> Sounds better, I've updated the PULL:
>>
>> git://git.pokylinux.org/poky-contrib rbt/clean_stamp
>>
>> and here is the patch:
>>
>> diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
>> index 35c3f85..d4e0dcb 100644
>> --- a/meta/classes/sstate.bbclass
>> +++ b/meta/classes/sstate.bbclass
>> @@ -331,11 +331,17 @@ def sstate_clean_manifest(manifest, d):
>>
>>    def sstate_clean(ss, d):
>>        import oe.path
>> +    import glob
>>
>>        d2 = d.createCopy()
>> +    stamp_clean = d.getVar("STAMPCLEAN", True)
>>        extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True)
>>        if extrainf:
>>            d2.setVar("SSTATE_MANMACH", extrainf)
>> +        wildcard_stfile = "%s.do_%s*.%s" % (stamp_clean, ss['task'], extrainf)
>> +    else:
>> +        wildcard_stfile = "%s.do_%s*" % (stamp_clean, ss['task'])
>> +
>>        manifest = d2.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'])
>>
>>        if os.path.exists(manifest):
>> @@ -350,15 +356,11 @@ def sstate_clean(ss, d):
>>            for lock in locks:
>>                bb.utils.unlockfile(lock)
>>
>> -    stfile = d.getVar("STAMP", True) + ".do_" + ss['task']
>> -    oe.path.remove(stfile)
>> -    oe.path.remove(stfile + "_setscene")
>> -    if extrainf:
>> -        oe.path.remove(stfile + ".*" + extrainf)
>> -        oe.path.remove(stfile + "_setscene" + ".*" + extrainf)
>> -    else:
>> -        oe.path.remove(stfile + ".*")
>> -        oe.path.remove(stfile + "_setscene" + ".*")
>> +    # Remove the current and previous stamps, but keep the sigdata
>> +    for stfile in glob.glob(wildcard_stfile):
>> +        # Keep the sigdata
>> +        if ".sigdata." not in stfile:
>> +            oe.path.remove(stfile)
>
> Sorry Robert, there is one more issue here. You're doing "do_%s*" but
> this can match multiple tasks, e.g. do_package* would also wipe out
> do_package_write_ipk, do_package_write_rpm etc.
>

Ah, it's my fault, the V3 is incoming.

// Robert

> The easiest way to handle this is probably in the for loop, making sure
> that do_<task>. or do_<task>_setscene. are in the filename.
>
> It might be worth putting some comments in the code about these
> subtleties.
>
> Cheers,
>
> Richard
>
>
>
>
>
>
>

Patch

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 35c3f85..d4e0dcb 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -331,11 +331,17 @@  def sstate_clean_manifest(manifest, d):

  def sstate_clean(ss, d):
      import oe.path
+    import glob

      d2 = d.createCopy()
+    stamp_clean = d.getVar("STAMPCLEAN", True)
      extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True)
      if extrainf:
          d2.setVar("SSTATE_MANMACH", extrainf)
+        wildcard_stfile = "%s.do_%s*.%s" % (stamp_clean, ss['task'], extrainf)
+    else:
+        wildcard_stfile = "%s.do_%s*" % (stamp_clean, ss['task'])
+
      manifest = d2.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'])

      if os.path.exists(manifest):
@@ -350,15 +356,11 @@  def sstate_clean(ss, d):
          for lock in locks:
              bb.utils.unlockfile(lock)

-    stfile = d.getVar("STAMP", True) + ".do_" + ss['task']
-    oe.path.remove(stfile)
-    oe.path.remove(stfile + "_setscene")
-    if extrainf:
-        oe.path.remove(stfile + ".*" + extrainf)
-        oe.path.remove(stfile + "_setscene" + ".*" + extrainf)
-    else:
-        oe.path.remove(stfile + ".*")
-        oe.path.remove(stfile + "_setscene" + ".*")
+    # Remove the current and previous stamps, but keep the sigdata
+    for stfile in glob.glob(wildcard_stfile):
+        # Keep the sigdata
+        if ".sigdata." not in stfile:
+            oe.path.remove(stfile)

  CLEANFUNCS += "sstate_cleanall"