diff options
-rw-r--r-- | meta/classes/staging.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/useradd.bbclass | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 6bcd0b087a..9207060222 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -168,7 +168,7 @@ def staging_processfixme(fixme, target, recipesysroot, recipesysrootnative, d): | |||
168 | if not fixme: | 168 | if not fixme: |
169 | return | 169 | return |
170 | cmd = "sed -e 's:^[^/]*/:%s/:g' %s | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:%s:g; s:FIXMESTAGINGDIRHOST:%s:g'" % (target, " ".join(fixme), recipesysroot, recipesysrootnative) | 170 | cmd = "sed -e 's:^[^/]*/:%s/:g' %s | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:%s:g; s:FIXMESTAGINGDIRHOST:%s:g'" % (target, " ".join(fixme), recipesysroot, recipesysrootnative) |
171 | for fixmevar in ['COMPONENTS_DIR', 'HOSTTOOLS_DIR', 'PKGDATA_DIR', 'PSEUDO_LOCALSTATEDIR', 'LOGFIFO']: | 171 | for fixmevar in ['PSEUDO_SYSROOT', 'HOSTTOOLS_DIR', 'PKGDATA_DIR', 'PSEUDO_LOCALSTATEDIR', 'LOGFIFO']: |
172 | fixme_path = d.getVar(fixmevar) | 172 | fixme_path = d.getVar(fixmevar) |
173 | cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path) | 173 | cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path) |
174 | bb.debug(2, cmd) | 174 | bb.debug(2, cmd) |
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 124becd082..5e600dec84 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
@@ -100,6 +100,8 @@ useradd_sysroot () { | |||
100 | # Pseudo may (do_prepare_recipe_sysroot) or may not (do_populate_sysroot_setscene) be running | 100 | # Pseudo may (do_prepare_recipe_sysroot) or may not (do_populate_sysroot_setscene) be running |
101 | # at this point so we're explicit about the environment so pseudo can load if | 101 | # at this point so we're explicit about the environment so pseudo can load if |
102 | # not already present. | 102 | # not already present. |
103 | # PSEUDO_SYSROOT can contain references to the build architecture and COMPONENT_DIR | ||
104 | # so needs the STAGING_FIXME below | ||
103 | export PSEUDO="${FAKEROOTENV} ${PSEUDO_SYSROOT}${bindir_native}/pseudo" | 105 | export PSEUDO="${FAKEROOTENV} ${PSEUDO_SYSROOT}${bindir_native}/pseudo" |
104 | 106 | ||
105 | # Explicitly set $D since it isn't set to anything | 107 | # Explicitly set $D since it isn't set to anything |
@@ -134,10 +136,10 @@ useradd_sysroot () { | |||
134 | } | 136 | } |
135 | 137 | ||
136 | # The export of PSEUDO in useradd_sysroot() above contains references to | 138 | # The export of PSEUDO in useradd_sysroot() above contains references to |
137 | # ${COMPONENTS_DIR} and ${PSEUDO_LOCALSTATEDIR}. Additionally, the logging | 139 | # ${PSEUDO_SYSROOT} and ${PSEUDO_LOCALSTATEDIR}. Additionally, the logging |
138 | # shell functions use ${LOGFIFO}. These need to be handled when restoring | 140 | # shell functions use ${LOGFIFO}. These need to be handled when restoring |
139 | # postinst-useradd-${PN} from the sstate cache. | 141 | # postinst-useradd-${PN} from the sstate cache. |
140 | EXTRA_STAGING_FIXMES += "COMPONENTS_DIR PSEUDO_LOCALSTATEDIR LOGFIFO" | 142 | EXTRA_STAGING_FIXMES += "PSEUDO_SYSROOT PSEUDO_LOCALSTATEDIR LOGFIFO" |
141 | 143 | ||
142 | python useradd_sysroot_sstate () { | 144 | python useradd_sysroot_sstate () { |
143 | scriptfile = None | 145 | scriptfile = None |