diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/sstate.bbclass | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index ccef4a9e39..ae019379bd 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -330,20 +330,27 @@ def sstate_hardcode_path(d): | |||
330 | sstate_grep_cmd = "grep -l -e '%s'" % (staging_host) | 330 | sstate_grep_cmd = "grep -l -e '%s'" % (staging_host) |
331 | sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRHOST:g'" % (staging_host) | 331 | sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRHOST:g'" % (staging_host) |
332 | 332 | ||
333 | fixmefn = sstate_builddir + "fixmepath" | ||
334 | |||
333 | sstate_scan_cmd = d.getVar('SSTATE_SCAN_CMD', True) | 335 | sstate_scan_cmd = d.getVar('SSTATE_SCAN_CMD', True) |
334 | sstate_filelist_cmd = "tee %sfixmepath" % (sstate_builddir) | 336 | sstate_filelist_cmd = "tee %s" % (fixmefn) |
335 | 337 | ||
336 | # fixmepath file needs relative paths, drop sstate_builddir prefix | 338 | # fixmepath file needs relative paths, drop sstate_builddir prefix |
337 | sstate_filelist_relative_cmd = "sed -i -e 's:^%s::g' %sfixmepath" % (sstate_builddir, sstate_builddir) | 339 | sstate_filelist_relative_cmd = "sed -i -e 's:^%s::g' %s" % (sstate_builddir, fixmefn) |
338 | 340 | ||
339 | # Limit the fixpaths and sed operations based on the initial grep search | 341 | # Limit the fixpaths and sed operations based on the initial grep search |
340 | # This has the side effect of making sure the vfs cache is hot | 342 | # This has the side effect of making sure the vfs cache is hot |
341 | sstate_hardcode_cmd = "%s | xargs %s | %s | xargs %s" % (sstate_scan_cmd, sstate_grep_cmd, sstate_filelist_cmd, sstate_sed_cmd) | 343 | sstate_hardcode_cmd = "%s | xargs %s | %s | xargs --no-run-if-empty %s" % (sstate_scan_cmd, sstate_grep_cmd, sstate_filelist_cmd, sstate_sed_cmd) |
342 | 344 | ||
343 | print "Removing hardcoded paths from sstate package: '%s'" % (sstate_hardcode_cmd) | 345 | print "Removing hardcoded paths from sstate package: '%s'" % (sstate_hardcode_cmd) |
344 | os.system(sstate_hardcode_cmd) | 346 | os.system(sstate_hardcode_cmd) |
345 | print "Replacing absolute paths in fixmepath file: '%s'" % (sstate_filelist_relative_cmd) | 347 | |
346 | os.system(sstate_filelist_relative_cmd) | 348 | # If the fixmefn is empty, remove it.. |
349 | if os.stat(fixmefn).st_size == 0: | ||
350 | os.remove(fixmefn) | ||
351 | else: | ||
352 | print "Replacing absolute paths in fixmepath file: '%s'" % (sstate_filelist_relative_cmd) | ||
353 | os.system(sstate_filelist_relative_cmd) | ||
347 | 354 | ||
348 | def sstate_package(ss, d): | 355 | def sstate_package(ss, d): |
349 | import oe.path | 356 | import oe.path |