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

login
register
mail settings
Submitter Robert Yang
Date Jan. 17, 2014, 6:43 a.m.
Message ID <981567c4dfef59be08373f124b36739449a546a1.1389940146.git.liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/65005/
State New
Headers show

Comments

Robert Yang - Jan. 17, 2014, 6:43 a.m.
There is a potential problem if we don't remove the previous version's
stamp, for example:

The depend chain is:
libtool-native -> autoconf-native -> m4-native
We have two m4-native: 1.4.9 and 1.4.7

1) Clean all of them to make a fresh build so that we can reproduce the
   problem
$ bitbake m4-native autoconf-native libtool-native -ccleansstate

2) Build libtool-native so that the m4-native_1.4.17 will be built
$ bitbake libtool-native

3) Set PREFERRED_VERSION_m4-native = "1.4.9" and build again
$ bitbake libtool-native

4) Set PREFERRED_VERSION_m4-native = "1.4.17" and build again
$ bitbake libtool-native -ccleansstate && bitbake libtool-native

Then the build will fail:
[snip]
| m4: unrecognized option '--gnu'
| Try `m4 --help' for more information.
| autom4te: m4 failed with exit status: 1
[snip]

The is because when we change m4-native to 1.4.17 and build
libtool-native again:
5) libtool-native depends on autoconf-native, and autoconf-native's
   version isn't change, so it can remove the current stamp and mirror
   the sstate (the one depends on m4-native_1.4.9) from the SSTATE_DIR
   correctly.

6) The mirrored autoconf-native depends on m4-native_1.4.17's
   do_populate_sysroot, and the stamp is already there (which is made
   by step 2), so it would do nothing, but this is incorrect, since
   the one that really in the sysroot is m4-native_1.4.9, then the
   error happens.

Remove previous version's stamp in sstate_clean() will fix the problem.

[YOCTO #5422]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/sstate.bbclass | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)
Richard Purdie - Jan. 17, 2014, 10:36 a.m.
On Fri, 2014-01-17 at 14:43 +0800, Robert Yang wrote:
> There is a potential problem if we don't remove the previous version's
> stamp, for example:
> 
> The depend chain is:
> libtool-native -> autoconf-native -> m4-native
> We have two m4-native: 1.4.9 and 1.4.7
> 
> 1) Clean all of them to make a fresh build so that we can reproduce the
>    problem
> $ bitbake m4-native autoconf-native libtool-native -ccleansstate
> 
> 2) Build libtool-native so that the m4-native_1.4.17 will be built
> $ bitbake libtool-native
> 
> 3) Set PREFERRED_VERSION_m4-native = "1.4.9" and build again
> $ bitbake libtool-native
> 
> 4) Set PREFERRED_VERSION_m4-native = "1.4.17" and build again
> $ bitbake libtool-native -ccleansstate && bitbake libtool-native
> 
> Then the build will fail:
> [snip]
> | m4: unrecognized option '--gnu'
> | Try `m4 --help' for more information.
> | autom4te: m4 failed with exit status: 1
> [snip]
> 
> The is because when we change m4-native to 1.4.17 and build
> libtool-native again:
> 5) libtool-native depends on autoconf-native, and autoconf-native's
>    version isn't change, so it can remove the current stamp and mirror
>    the sstate (the one depends on m4-native_1.4.9) from the SSTATE_DIR
>    correctly.
> 
> 6) The mirrored autoconf-native depends on m4-native_1.4.17's
>    do_populate_sysroot, and the stamp is already there (which is made
>    by step 2), so it would do nothing, but this is incorrect, since
>    the one that really in the sysroot is m4-native_1.4.9, then the
>    error happens.
> 
> Remove previous version's stamp in sstate_clean() will fix the problem.
> 
> [YOCTO #5422]
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  meta/classes/sstate.bbclass | 22 +++++++++++++---------
>  1 file changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
> index 35c3f85..bad8b78 100644
> --- a/meta/classes/sstate.bbclass
> +++ b/meta/classes/sstate.bbclass
> @@ -331,11 +331,18 @@ def sstate_clean_manifest(manifest, d):
>  
>  def sstate_clean(ss, d):
>      import oe.path
> +    import glob
> +    import re
>  
>      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 +357,12 @@ 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
> +    re_sigdata = ".*\.do_%s\.sigdata\." % ss['task']
> +    for stfile in glob.glob(wildcard_stfile):
> +        # 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:

Cheers,

Richard

Patch

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 35c3f85..bad8b78 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -331,11 +331,18 @@  def sstate_clean_manifest(manifest, d):
 
 def sstate_clean(ss, d):
     import oe.path
+    import glob
+    import re
 
     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 +357,12 @@  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
+    re_sigdata = ".*\.do_%s\.sigdata\." % ss['task']
+    for stfile in glob.glob(wildcard_stfile):
+        # Keep the sigdata
+        if not re.match(re_sigdata, stfile):
+            oe.path.remove(stfile)
 
 CLEANFUNCS += "sstate_cleanall"