diff options
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r-- | meta/classes/sstate.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index ad7d121f25..3fc615d1e7 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -321,10 +321,13 @@ def sstate_hardcode_path(d): | |||
321 | sstate_builddir = d.getVar('SSTATE_BUILDDIR', True) | 321 | sstate_builddir = d.getVar('SSTATE_BUILDDIR', True) |
322 | 322 | ||
323 | 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): | 323 | 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): |
324 | sstate_grep_cmd = "grep -l -e '%s'" % (staging) | ||
324 | sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIR:g'" % (staging) | 325 | sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIR:g'" % (staging) |
325 | elif bb.data.inherits_class('cross', d): | 326 | elif bb.data.inherits_class('cross', d): |
327 | sstate_grep_cmd = "grep -l -e '(%s|%s)'" % (staging_target, staging) | ||
326 | sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRTARGET:g; s:%s:FIXMESTAGINGDIR:g'" % (staging_target, staging) | 328 | sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRTARGET:g; s:%s:FIXMESTAGINGDIR:g'" % (staging_target, staging) |
327 | else: | 329 | else: |
330 | sstate_grep_cmd = "grep -l -e '%s'" % (staging_host) | ||
328 | 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) |
329 | 332 | ||
330 | sstate_scan_cmd = d.getVar('SSTATE_SCAN_CMD', True) | 333 | sstate_scan_cmd = d.getVar('SSTATE_SCAN_CMD', True) |
@@ -333,7 +336,9 @@ def sstate_hardcode_path(d): | |||
333 | # fixmepath file needs relative paths, drop sstate_builddir prefix | 336 | # fixmepath file needs relative paths, drop sstate_builddir prefix |
334 | sstate_filelist_relative_cmd = "sed -i -e 's:^%s::g' %sfixmepath" % (sstate_builddir, sstate_builddir) | 337 | sstate_filelist_relative_cmd = "sed -i -e 's:^%s::g' %sfixmepath" % (sstate_builddir, sstate_builddir) |
335 | 338 | ||
336 | sstate_hardcode_cmd = "%s | %s | xargs %s" % (sstate_scan_cmd, sstate_filelist_cmd, sstate_sed_cmd) | 339 | # 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 | ||
341 | sstate_hardcode_cmd = "%s | xargs %s | %s | xargs %s" % (sstate_scan_cmd, sstate_grep_cmd, sstate_filelist_cmd, sstate_sed_cmd) | ||
337 | 342 | ||
338 | print "Removing hardcoded paths from sstate package: '%s'" % (sstate_hardcode_cmd) | 343 | print "Removing hardcoded paths from sstate package: '%s'" % (sstate_hardcode_cmd) |
339 | os.system(sstate_hardcode_cmd) | 344 | os.system(sstate_hardcode_cmd) |