mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
sstate: Improve performance by moving files rather than using copy and delete
Acked-by: Joshua Lock <josh@linux.intel.com> (From OE-Core rev: c5913c644d10470e2c3c8b55cf044995fc109d87) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -147,6 +147,13 @@ def sstate_install(ss, d):
|
||||
def sstate_installpkg(ss, d):
|
||||
import oe.path
|
||||
|
||||
def prepdir(dir):
|
||||
# remove dir if it exists, ensure any parent directories do exist
|
||||
if os.path.exists(dir):
|
||||
oe.path.remove(dir)
|
||||
bb.mkdirhier(dir)
|
||||
oe.path.remove(dir)
|
||||
|
||||
sstateinst = bb.data.expand("${WORKDIR}/sstate-install-%s/" % ss['name'], d)
|
||||
sstatepkg = bb.data.getVar('SSTATE_PKG', d, True) + '_' + ss['name'] + ".tgz"
|
||||
|
||||
@@ -178,9 +185,8 @@ def sstate_installpkg(ss, d):
|
||||
os.system("sed -i -e s:FIXMESTAGINGDIR:%s:g %s" % (staging, sstateinst + file))
|
||||
|
||||
for state in ss['dirs']:
|
||||
if os.path.exists(state[1]):
|
||||
oe.path.remove(state[1])
|
||||
oe.path.copytree(sstateinst + state[0], state[1])
|
||||
prepdir(state[1])
|
||||
os.rename(sstateinst + state[0], state[1])
|
||||
sstate_install(ss, d)
|
||||
|
||||
for plain in ss['plaindirs']:
|
||||
@@ -188,8 +194,8 @@ def sstate_installpkg(ss, d):
|
||||
src = sstateinst + "/" + plain.replace(workdir, '')
|
||||
dest = plain
|
||||
bb.mkdirhier(src)
|
||||
bb.mkdirhier(dest)
|
||||
oe.path.copytree(src, dest)
|
||||
prepdir(dest)
|
||||
os.rename(src, dest)
|
||||
|
||||
return True
|
||||
|
||||
|
||||
Reference in New Issue
Block a user