sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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)

(From OE-Core rev: 213d31f24d911a10132ddcd75f50363a80c4dc2e)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Garman 2011-11-06 11:22:35 -08:00 committed by Richard Purdie
parent 57c6f14828
commit ae88920dec
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/useradd.bbclass
View File

@ -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