summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-08-30 16:13:49 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-31 16:38:20 +0100
commite055544ce1cdfa15c6d81c4e543972d60a6ebaac (patch)
tree38b396fd297a2994bb12fad0ce66147032c48a76 /meta
parent03983e96475214facbdc2bcb79246a2f209c3935 (diff)
downloadpoky-e055544ce1cdfa15c6d81c4e543972d60a6ebaac.tar.gz
sstate: fix dir name in manifest
dir name in manifest is incorrect: /media/disk/builds/master-arm/tmp/sysroots/usr/ /media/disk/builds/master-arm/tmp/sysroots/lib/ /media/disk/builds/master-arm/tmp/sysroots/include/ Also add one debug note when removing manifest entries Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sstate.bbclass11
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 7d253a7dc5..57deaed18c 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -96,10 +96,12 @@ def sstate_install(ss, d):
96 bb.debug(2, "Staging %s to %s" % (srcpath, dstpath)) 96 bb.debug(2, "Staging %s to %s" % (srcpath, dstpath))
97 sharedfiles.append(dstpath) 97 sharedfiles.append(dstpath)
98 for dir in dirs: 98 for dir in dirs:
99 dir = os.path.join(state[2], dir) 99 srcdir = os.path.join(walkroot, dir)
100 if not dir.endswith("/"): 100 dstdir = srcdir.replace(state[1], state[2])
101 dir = dir + "/" 101 bb.debug(2, "Staging %s to %s" % (srcdir, dstdir))
102 shareddirs.append(dir) 102 if not dstdir.endswith("/"):
103 dstdir = dstdir + "/"
104 shareddirs.append(dstdir)
103 f = open(manifest, "w") 105 f = open(manifest, "w")
104 for file in sharedfiles: 106 for file in sharedfiles:
105 f.write(file + "\n") 107 f.write(file + "\n")
@@ -166,6 +168,7 @@ def sstate_clean_manifest(manifest, d):
166 168
167 for entry in entries: 169 for entry in entries:
168 entry = entry.strip() 170 entry = entry.strip()
171 bb.debug(2, "Removing manifest: %s" % entry)
169 if entry.endswith("/"): 172 if entry.endswith("/"):
170 if os.path.exists(entry) and len(os.listdir(entry)) == 0: 173 if os.path.exists(entry) and len(os.listdir(entry)) == 0:
171 os.rmdir(entry) 174 os.rmdir(entry)