summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/sstate.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 65f51430ee..68089421f5 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -541,15 +541,15 @@ python sstate_hardcode_path () {
541 staging_host = d.getVar('RECIPE_SYSROOT_NATIVE') 541 staging_host = d.getVar('RECIPE_SYSROOT_NATIVE')
542 sstate_builddir = d.getVar('SSTATE_BUILDDIR') 542 sstate_builddir = d.getVar('SSTATE_BUILDDIR')
543 543
544 sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRHOST:g'" % staging_host
544 if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross-canadian', d): 545 if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross-canadian', d):
545 sstate_grep_cmd = "grep -l -e '%s'" % (staging_host) 546 sstate_grep_cmd = "grep -l -e '%s'" % (staging_host)
546 sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRHOST:g'" % (staging_host)
547 elif bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d): 547 elif bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d):
548 sstate_grep_cmd = "grep -l -e '%s' -e '%s'" % (staging_target, staging_host) 548 sstate_grep_cmd = "grep -l -e '%s' -e '%s'" % (staging_target, staging_host)
549 sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRTARGET:g; s:%s:FIXMESTAGINGDIRHOST:g'" % (staging_target, staging_host) 549 sstate_sed_cmd += " -e 's:%s:FIXMESTAGINGDIRTARGET:g'" % staging_target
550 else: 550 else:
551 sstate_grep_cmd = "grep -l -e '%s'" % (staging_target) 551 sstate_grep_cmd = "grep -l -e '%s' -e '%s'" % (staging_target, staging_host)
552 sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRTARGET:g'" % (staging_target) 552 sstate_sed_cmd += " -e 's:%s:FIXMESTAGINGDIRTARGET:g'" % staging_target
553 553
554 extra_staging_fixmes = d.getVar('EXTRA_STAGING_FIXMES') or '' 554 extra_staging_fixmes = d.getVar('EXTRA_STAGING_FIXMES') or ''
555 for fixmevar in extra_staging_fixmes.split(): 555 for fixmevar in extra_staging_fixmes.split():