summaryrefslogtreecommitdiff
path: root/meta/classes
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/classes
parent03983e96475214facbdc2bcb79246a2f209c3935 (diff)
downloadopenembedded-core-e055544ce1cdfa15c6d81c4e543972d60a6ebaac.tar.gz
openembedded-core-e055544ce1cdfa15c6d81c4e543972d60a6ebaac.tar.bz2
openembedded-core-e055544ce1cdfa15c6d81c4e543972d60a6ebaac.tar.xz
openembedded-core-e055544ce1cdfa15c6d81c4e543972d60a6ebaac.zip
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/classes')
-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 7d253a7dc..57deaed18 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -96,10 +96,12 @@ def sstate_install(ss, d):
bb.debug(2, "Staging %s to %s" % (srcpath, dstpath))
sharedfiles.append(dstpath)
for dir in dirs:
- dir = os.path.join(state[2], dir)
- if not dir.endswith("/"):
- dir = dir + "/"
- shareddirs.append(dir)
+ srcdir = os.path.join(walkroot, dir)
+ dstdir = srcdir.replace(state[1], state[2])
+ bb.debug(2, "Staging %s to %s" % (srcdir, dstdir))
+ if not dstdir.endswith("/"):
+ dstdir = dstdir + "/"
+ shareddirs.append(dstdir)
f = open(manifest, "w")
for file in sharedfiles:
f.write(file + "\n")
@@ -166,6 +168,7 @@ def sstate_clean_manifest(manifest, d):
for entry in entries:
entry = entry.strip()
+ bb.debug(2, "Removing manifest: %s" % entry)
if entry.endswith("/"):
if os.path.exists(entry) and len(os.listdir(entry)) == 0:
os.rmdir(entry)