summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-07 17:34:07 (GMT)
committerSaul Wold <sgw@linux.intel.com>2011-12-13 20:04:55 (GMT)
commit160c1d99774969b4bf23662421c2bf1894244345 (patch)
tree252190a635a5976dfc84f8027e0cd294427281f3
parentb9d3a5224c7f76f273d5919a88b7460d35ad2574 (diff)
downloadpoky-160c1d99774969b4bf23662421c2bf1894244345.tar.gz
bitbake.conf/image.bbclass: Ensure images use the correct passwd/group files
We need pseudo to use the rootfs passwd/group files belonging to the rootfs when building images. This patch ensures that we use the rootfs files instead of those in the sysroot which can lead to incorrect file ownership issues. (From OE-Core rev: c4da803ef78322b758380eb0af0dcb73cae6553c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/conf/bitbake.conf3
2 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 4642fa6..865d430 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -121,6 +121,8 @@ IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
121 121
122LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS', 1).split()))}" 122LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS', 1).split()))}"
123 123
124PSEUDO_PASSWD = "${IMAGE_ROOTFS}"
125
124do_rootfs[nostamp] = "1" 126do_rootfs[nostamp] = "1"
125do_rootfs[dirs] = "${TOPDIR}" 127do_rootfs[dirs] = "${TOPDIR}"
126do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock" 128do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index e80cc32..eeb1fc4 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -580,11 +580,12 @@ SRC_URI = "file://${FILE}"
580 580
581# Use pseudo as the fakeroot implementation 581# Use pseudo as the fakeroot implementation
582PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" 582PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/"
583PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}"
583export PSEUDO_DISABLED = "1" 584export PSEUDO_DISABLED = "1"
584#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}" 585#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}"
585#export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}" 586#export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}"
586#export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib 587#export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib
587FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${STAGING_DIR_TARGET} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0" 588FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0"
588FAKEROOTNOENV = "PSEUDO_UNLOAD=1" 589FAKEROOTNOENV = "PSEUDO_UNLOAD=1"
589FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" 590FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}"
590PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" 591PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native"