summaryrefslogtreecommitdiffstats
path: root/meta/classes/image.bbclass
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2014-11-14 22:58:16 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-25 13:03:29 +0000
commitd1434d97f505fb40eb4206cf07704da4d2c66153 (patch)
tree49a8641cf7230d24b352b070cbb362136e33a5c2 /meta/classes/image.bbclass
parent835f5c84109693a807229f6ab9d75c850f45eff1 (diff)
downloadpoky-d1434d97f505fb40eb4206cf07704da4d2c66153.tar.gz
image.bbclass: search both rootfs and native staging for passwd files
When pseudo is configured to disallow fallback to the build host /etc/hosts and /etc/group, the selection of ${IMAGE_ROOT} for PSEUDO_PASSWD is insufficient as the necessary files will not be available until base-passwd has been installed and its pkg_postinst script run. Fall back to the ${STAGING_DIR_NATIVE} version of those files until the rootfs versions are available. (The native copies are never modified by the build; the ones in ${STAGING_DIR_TARGET} are updated and may contain settings not consistent with what would be created by post-install useradd/groupadd commands invoked in the image rootfs. (From OE-Core rev: 8c653bafaa32126c54400bb56b9a94f07cd33197) Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r--meta/classes/image.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index fc08653d2d..6bbfaf8208 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -175,7 +175,9 @@ IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
175 175
176LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS', True).split()))}" 176LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS', True).split()))}"
177 177
178PSEUDO_PASSWD = "${IMAGE_ROOTFS}" 178# Prefer image, but use the fallback files for lookups if the image ones
179# aren't yet available.
180PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}"
179 181
180do_rootfs[dirs] = "${TOPDIR}" 182do_rootfs[dirs] = "${TOPDIR}"
181do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock" 183do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock"