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

sstate.bbclass: Optimise sstate_hardcode_path

Browse Source 
The sstate_hardcode_path() function triggered large numbers of exec()
calls when processing packages with large numbers of file relocations
(e.g. perl). This patch optimises those calls into longer single commands
which make the code significantly more efficient.

This reduced the do_package time for perl by 2 minutes (from 4.75 minutes)
for me.

(From OE-Core rev: 4159ff761cf29a03aeb56c7686a4e7af02b52219)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2012-02-10 00:07:05 +00:00
parent 765547eb71
commit d60912993d
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
meta/classes/sstate.bbclass
View File

@@ -317,19 +317,24 @@ def sstate_hardcode_path(d):
staging_host = d.getVar('STAGING_DIR_HOST', True)
sstate_builddir = d.getVar('SSTATE_BUILDDIR', True)
for i in file_list.split('\n'):
if not i:
continue
if bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross-canadian', d):
cmd = "sed -i -e s:%s:FIXMESTAGINGDIR:g %s" % (staging, i)
elif bb.data.inherits_class('cross', d):
cmd = "sed -i -e s:%s:FIXMESTAGINGDIRTARGET:g %s \
sed -i -e s:%s:FIXMESTAGINGDIR:g %s" % (staging_target, i, staging, i)
else:
cmd = "sed -i -e s:%s:FIXMESTAGINGDIRHOST:g %s" % (staging_host, i)
files = " ".join(file_list.split('\n'))
if bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross-canadian', d):
cmd = "sed -i -e s:%s:FIXMESTAGINGDIR:g %s" % (staging, files)
elif bb.data.inherits_class('cross', d):
cmd = "sed -i -e s:%s:FIXMESTAGINGDIRTARGET:g %s \
sed -i -e s:%s:FIXMESTAGINGDIR:g %s" % (staging_target, files, staging, files)
else:
cmd = "sed -i -e s:%s:FIXMESTAGINGDIRHOST:g %s" % (staging_host, files)
if files:
os.system(cmd)
os.system("echo %s | sed -e 's:%s::' >> %sfixmepath" % (i, sstate_builddir, sstate_builddir))
fix = open("%sfixmepath" % (sstate_builddir), "w")
fixme = []
for f in file_list.split('\n'):
fixme.append(f.replace(sstate_builddir, ""))
fix.write("\n".join(fixme))
fix.close()
p.close()
def sstate_package(ss, d):