| Submitter | Eric BENARD |
|---|---|
| Date | Nov. 8, 2011, 3:46 p.m. |
| Message ID | <1320767198-15262-1-git-send-email-eric@eukrea.com> |
| Download | mbox | patch |
| Permalink | /patch/14523/ |
| State | Accepted |
| Commit | 140a3507fb5c14cd9bcebe4304f491aa1c5c47a2 |
| Headers | show |
Comments
On Tue, 2011-11-08 at 16:46 +0100, Eric Bénard wrote: > * without this patch, building dbus-nativesdk leads to a missing > dependency on 'base-passwd-nativesdk' > This was added by commit 46e6c3fa8034b12d178d605f3f5d7efe69671a13 > * this patch handle the nativesdk case in the class useradd > * close bug 1702 http://bugzilla.pokylinux.org/show_bug.cgi?id=1702 > * v2 from Scott Garman with Richard Purdie's tricks > > Signed-off-by: Eric Bénard <eric@eukrea.com> > Signed-off-by: Scott Garman <scott.a.garman@intel.com> > --- > meta/classes/useradd.bbclass | 12 +++++++++--- > 1 files changed, 9 insertions(+), 3 deletions(-) Merged to master, thanks. Richard
Patch
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 0f9b84c..a8a1c14 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -3,7 +3,9 @@ USERADDPN ?= "${PN}" # base-passwd-cross provides the default passwd and group files in the # 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" +DEPENDS_append = "${USERADDDEPENDS}" +USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot" +USERADDDEPENDS_virtclass-nativesdk = "" # This preinstall function will be run in two contexts: once for the # native sysroot (as invoked by the useradd_sysroot() wrapper), and @@ -95,8 +97,12 @@ useradd_sysroot_sstate () { fi } -do_install[prefuncs] += "useradd_sysroot" -SSTATEPOSTINSTFUNCS += "useradd_sysroot_sstate" +do_install[prefuncs] += "${SYSROOTFUNC}" +SYSROOTFUNC = "useradd_sysroot" +SYSROOTFUNC_virtclass-nativesdk = "" +SSTATEPOSTINSTFUNCS += "${SYSROOTPOSTFUNC}" +SYSROOTPOSTFUNC = "useradd_sysroot_sstate" +SYSROOTPOSTFUNC_virtclass-nativesdk = "" # Recipe parse-time sanity checks def update_useradd_after_parse(d):