summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-03-24 00:05:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-24 12:33:38 +0000
commit25a6e5f98cea5ee3f79ad0e444572997ae736e8f (patch)
tree4e56e033180ab87a81bb858ebe623704d6bf806f /meta/classes
parentc106bb61f56ab276d94a48f5a5cdc55d8e12d56a (diff)
downloadpoky-25a6e5f98cea5ee3f79ad0e444572997ae736e8f.tar.gz
sstate: use only unique set of SSTATETASK
* otherwise strange error like this: ERROR: Logfile of failure stored in: /OE/shr-core/tmp/work/armv7a-oe-linux-gnueabi/libtool-cross-2.4-r1/temp/log.do_package_write_ipk.25551 Log data follows: | ERROR: Package already staged (/OE/shr-core/tmp/sstate-control/manifest-nokia900-libtool-cross.deploy-ipk)?! | ERROR: Function 'sstate_task_postfunc' failed NOTE: package libtool-cross-2.4-r1: task do_package_write_ipk: Failed ERROR: Task 11 (/OE/shr-core/openembedded-core/meta/recipes-devtools/libtool/libtool-cross_2.4.bb, do_package_write_ipk) failed with exit code '1' is shown in this case with package_ipk twice in INHERIT * Thanks to Richard for fix (From OE-Core rev: f2fe5e840b8aa0558b5462ef2c7517b2f14ec2ea) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sstate.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index d57c183004..00a709ba44 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -40,7 +40,7 @@ python () {
40 bb.data.setVar('SSTATE_SCAN_CMD', scan_cmd, d) 40 bb.data.setVar('SSTATE_SCAN_CMD', scan_cmd, d)
41 41
42 namemap = [] 42 namemap = []
43 for task in (bb.data.getVar('SSTATETASKS', d, True) or "").split(): 43 for task in set((bb.data.getVar('SSTATETASKS', d, True) or "").split()):
44 namemap.append(bb.data.getVarFlag(task, 'sstate-name', d)) 44 namemap.append(bb.data.getVarFlag(task, 'sstate-name', d))
45 funcs = bb.data.getVarFlag(task, 'prefuncs', d) or "" 45 funcs = bb.data.getVarFlag(task, 'prefuncs', d) or ""
46 funcs = "sstate_task_prefunc " + funcs 46 funcs = "sstate_task_prefunc " + funcs
@@ -195,7 +195,7 @@ def sstate_clean_cachefile(ss, d):
195 oe.path.remove(sstatepkgfile) 195 oe.path.remove(sstatepkgfile)
196 196
197def sstate_clean_cachefiles(d): 197def sstate_clean_cachefiles(d):
198 for task in (bb.data.getVar('SSTATETASKS', d, True) or "").split(): 198 for task in set((bb.data.getVar('SSTATETASKS', d, True) or "").split()):
199 ss = sstate_state_fromvars(d, task[3:]) 199 ss = sstate_state_fromvars(d, task[3:])
200 sstate_clean_cachefile(ss, d) 200 sstate_clean_cachefile(ss, d)
201 201