summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-01-20 19:42:34 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-21 10:45:29 +0000
commita6c6659b3fa9de204ef3d194407c9ede71995141 (patch)
tree473366328998262fb2a3c1c4b314445d4d3a808f /meta/classes
parent4b62d9fc03d7f397e2417ee028b2d8fa82ca2384 (diff)
downloadpoky-a6c6659b3fa9de204ef3d194407c9ede71995141.tar.gz
sstate.bbclass: remove previous version's stamp
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] (From OE-Core rev: 4659d29b1040349116549644e45035a5b37d9311) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sstate.bbclass31
1 files changed, 22 insertions, 9 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 35c3f85cfc..23d7de6556 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -331,11 +331,17 @@ def sstate_clean_manifest(manifest, d):
331 331
332def sstate_clean(ss, d): 332def sstate_clean(ss, d):
333 import oe.path 333 import oe.path
334 import glob
334 335
335 d2 = d.createCopy() 336 d2 = d.createCopy()
337 stamp_clean = d.getVar("STAMPCLEAN", True)
336 extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True) 338 extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True)
337 if extrainf: 339 if extrainf:
338 d2.setVar("SSTATE_MANMACH", extrainf) 340 d2.setVar("SSTATE_MANMACH", extrainf)
341 wildcard_stfile = "%s.do_%s*.%s" % (stamp_clean, ss['task'], extrainf)
342 else:
343 wildcard_stfile = "%s.do_%s*" % (stamp_clean, ss['task'])
344
339 manifest = d2.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name']) 345 manifest = d2.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'])
340 346
341 if os.path.exists(manifest): 347 if os.path.exists(manifest):
@@ -350,15 +356,22 @@ def sstate_clean(ss, d):
350 for lock in locks: 356 for lock in locks:
351 bb.utils.unlockfile(lock) 357 bb.utils.unlockfile(lock)
352 358
353 stfile = d.getVar("STAMP", True) + ".do_" + ss['task'] 359 # Remove the current and previous stamps, but keep the sigdata.
354 oe.path.remove(stfile) 360 #
355 oe.path.remove(stfile + "_setscene") 361 # The glob() matches do_task* which may match multiple tasks, for
356 if extrainf: 362 # example: do_package and do_package_write_ipk, so we need to
357 oe.path.remove(stfile + ".*" + extrainf) 363 # exactly match *.do_task.* and *.do_task_setscene.*
358 oe.path.remove(stfile + "_setscene" + ".*" + extrainf) 364 rm_stamp = '.do_%s.' % ss['task']
359 else: 365 rm_setscene = '.do_%s_setscene.' % ss['task']
360 oe.path.remove(stfile + ".*") 366 # For BB_SIGNATURE_HANDLER = "noop"
361 oe.path.remove(stfile + "_setscene" + ".*") 367 rm_nohash = ".do_%s" % ss['task']
368 for stfile in glob.glob(wildcard_stfile):
369 # Keep the sigdata
370 if ".sigdata." in stfile:
371 continue
372 if rm_stamp in stfile or rm_setscene in stfile or \
373 stfile.endswith(rm_nohash):
374 oe.path.remove(stfile)
362 375
363CLEANFUNCS += "sstate_cleanall" 376CLEANFUNCS += "sstate_cleanall"
364 377