mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 06:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

sstate: fix dir name in manifest

Browse Source 
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>
This commit is contained in:
Kevin Tian
2010-08-30 16:13:49 +08:00
committed by Richard Purdie
parent 03983e9647
commit e055544ce1
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
meta/classes/sstate.bbclass
View File

@@ -96,10 +96,12 @@ def sstate_install(ss, d):
bb.debug(2, "Staging %s to %s" % (srcpath, dstpath)) bb.debug(2, "Staging %s to %s" % (srcpath, dstpath))
sharedfiles.append(dstpath) sharedfiles.append(dstpath)
for dir in dirs: for dir in dirs:
dir = os.path.join(state[2], dir) srcdir = os.path.join(walkroot, dir)
if not dir.endswith("/"): dstdir = srcdir.replace(state[1], state[2])
dir = dir + "/" bb.debug(2, "Staging %s to %s" % (srcdir, dstdir))
shareddirs.append(dir) if not dstdir.endswith("/"):
dstdir = dstdir + "/"
shareddirs.append(dstdir)
f = open(manifest, "w") f = open(manifest, "w")
for file in sharedfiles: for file in sharedfiles:
f.write(file + "\n") f.write(file + "\n")
@@ -166,6 +168,7 @@ def sstate_clean_manifest(manifest, d):
for entry in entries: for entry in entries:
entry = entry.strip() entry = entry.strip()
bb.debug(2, "Removing manifest: %s" % entry)
if entry.endswith("/"): if entry.endswith("/"):
if os.path.exists(entry) and len(os.listdir(entry)) == 0: if os.path.exists(entry) and len(os.listdir(entry)) == 0:
os.rmdir(entry) os.rmdir(entry)