diff options
-rw-r--r-- | meta/classes/staging.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/useradd.bbclass | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index a90cf43c94..984051d6aa 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -249,7 +249,7 @@ def staging_processfixme(fixme, target, recipesysroot, recipesysrootnative, d): | |||
249 | if not fixme: | 249 | if not fixme: |
250 | return | 250 | return |
251 | cmd = "sed -e 's:^[^/]*/:%s/:g' %s | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:%s:g; s:FIXMESTAGINGDIRHOST:%s:g'" % (target, " ".join(fixme), recipesysroot, recipesysrootnative) | 251 | cmd = "sed -e 's:^[^/]*/:%s/:g' %s | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:%s:g; s:FIXMESTAGINGDIRHOST:%s:g'" % (target, " ".join(fixme), recipesysroot, recipesysrootnative) |
252 | for fixmevar in ['COMPONENTS_DIR', 'HOSTTOOLS_DIR', 'PKGDATA_DIR']: | 252 | for fixmevar in ['COMPONENTS_DIR', 'HOSTTOOLS_DIR', 'PKGDATA_DIR', 'PSEUDO_LOCALSTATEDIR', 'LOGFIFO']: |
253 | fixme_path = d.getVar(fixmevar) | 253 | fixme_path = d.getVar(fixmevar) |
254 | cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path) | 254 | cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path) |
255 | bb.debug(2, cmd) | 255 | bb.debug(2, cmd) |
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 0f51e5522b..0f551b50f3 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
@@ -133,9 +133,10 @@ useradd_sysroot () { | |||
133 | } | 133 | } |
134 | 134 | ||
135 | # The export of PSEUDO in useradd_sysroot() above contains references to | 135 | # The export of PSEUDO in useradd_sysroot() above contains references to |
136 | # ${COMPONENTS_DIR}. These need to be handled when restoring | 136 | # ${COMPONENTS_DIR} and ${PSEUDO_LOCALSTATEDIR}. Additionally, the logging |
137 | # shell functions use ${LOGFIFO}. These need to be handled when restoring | ||
137 | # postinst-useradd-${PN} from the sstate cache. | 138 | # postinst-useradd-${PN} from the sstate cache. |
138 | EXTRA_STAGING_FIXMES += "COMPONENTS_DIR" | 139 | EXTRA_STAGING_FIXMES += "COMPONENTS_DIR PSEUDO_LOCALSTATEDIR LOGFIFO" |
139 | 140 | ||
140 | python useradd_sysroot_sstate () { | 141 | python useradd_sysroot_sstate () { |
141 | task = d.getVar("BB_CURRENTTASK") | 142 | task = d.getVar("BB_CURRENTTASK") |