diff options
| author | Scott Garman <scott.a.garman@intel.com> | 2011-11-06 11:22:35 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-08 14:13:24 +0000 |
| commit | 27d70f96558bad40b9c2aed54a2a704ef8e5a50e (patch) | |
| tree | b3e9b1595d9101ed917dbc901e3734be7f7bf7cb /meta | |
| parent | 28940eb97d835b45ecbf832f25e94fc1574f25a1 (diff) | |
| download | ast2050-yocto-poky-27d70f96558bad40b9c2aed54a2a704ef8e5a50e.zip ast2050-yocto-poky-27d70f96558bad40b9c2aed54a2a704ef8e5a50e.tar.gz | |
useradd.bbclass: fix how RDEPENDS is setup
Fix bug where only packages named PN included base-passwd in
RDEPENDS.
This fixes [YOCTO #1727]
(From OE-Core rev: 2c55d51afd71d708a54afc8377e10c4f80f810e3)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/useradd.bbclass | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index fb70b3e..0f9b84c 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 |
