summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-11-06 11:22:35 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-08 14:07:59 +0000
commit2c55d51afd71d708a54afc8377e10c4f80f810e3 (patch)
treee5dd1b36a2187060607cabc18ba4cbd07ff75fff /meta
parent0809f98e995d3a2ce24ad25bade3dcd5154061fd (diff)
downloadopenembedded-core-2c55d51afd71d708a54afc8377e10c4f80f810e3.tar.gz
openembedded-core-2c55d51afd71d708a54afc8377e10c4f80f810e3.tar.bz2
openembedded-core-2c55d51afd71d708a54afc8377e10c4f80f810e3.zip
useradd.bbclass: fix how RDEPENDS is setup
Fix bug where only packages named PN included base-passwd in RDEPENDS. This fixes [YOCTO #1727] Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/useradd.bbclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index fb70b3e679..0f9b84ca06 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -4,7 +4,6 @@ USERADDPN ?= "${PN}"
# target sysroot, and shadow -native and -sysroot provide the utilities
# and support files needed to add and modify user and group accounts
DEPENDS_append = " base-passwd shadow-native shadow-sysroot"
-RDEPENDS_${USERADDPN}_append = " base-passwd shadow"
# This preinstall function will be run in two contexts: once for the
# native sysroot (as invoked by the useradd_sysroot() wrapper), and
@@ -147,6 +146,11 @@ fakeroot python populate_packages_prepend () {
preinst += d.getVar('useradd_preinst', True)
bb.data.setVar('pkg_preinst_%s' % pkg, preinst, d)
+ # RDEPENDS setup
+ rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
+ rdepends += " base-passwd shadow"
+ bb.data.setVar("RDEPENDS_%s" % pkg, rdepends, d)
+
# We add the user/group calls to all packages to allow any package
# to contain files owned by the users/groups defined in the recipe.
# The user/group addition code is careful not to create duplicate