summaryrefslogtreecommitdiffstats
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:13:24 +0000
commit27d70f96558bad40b9c2aed54a2a704ef8e5a50e (patch)
treeb3e9b1595d9101ed917dbc901e3734be7f7bf7cb
parent28940eb97d835b45ecbf832f25e94fc1574f25a1 (diff)
downloadpoky-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>
-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}"
4# target sysroot, and shadow -native and -sysroot provide the utilities 4# target sysroot, and shadow -native and -sysroot provide the utilities
5# and support files needed to add and modify user and group accounts 5# and support files needed to add and modify user and group accounts
6DEPENDS_append = " base-passwd shadow-native shadow-sysroot" 6DEPENDS_append = " base-passwd shadow-native shadow-sysroot"
7RDEPENDS_${USERADDPN}_append = " base-passwd shadow"
8 7
9# This preinstall function will be run in two contexts: once for the 8# This preinstall function will be run in two contexts: once for the
10# native sysroot (as invoked by the useradd_sysroot() wrapper), and 9# native sysroot (as invoked by the useradd_sysroot() wrapper), and
@@ -147,6 +146,11 @@ fakeroot python populate_packages_prepend () {
147 preinst += d.getVar('useradd_preinst', True) 146 preinst += d.getVar('useradd_preinst', True)
148 bb.data.setVar('pkg_preinst_%s' % pkg, preinst, d) 147 bb.data.setVar('pkg_preinst_%s' % pkg, preinst, d)
149 148
149 # RDEPENDS setup
150 rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
151 rdepends += " base-passwd shadow"
152 bb.data.setVar("RDEPENDS_%s" % pkg, rdepends, d)
153
150 # We add the user/group calls to all packages to allow any package 154 # We add the user/group calls to all packages to allow any package
151 # to contain files owned by the users/groups defined in the recipe. 155 # to contain files owned by the users/groups defined in the recipe.
152 # The user/group addition code is careful not to create duplicate 156 # The user/group addition code is careful not to create duplicate