From 140a3507fb5c14cd9bcebe4304f491aa1c5c47a2 Mon Sep 17 00:00:00 2001 From: Eric Bénard Date: Tue, 8 Nov 2011 16:46:38 +0100 Subject: useradd.bbclass: handle nativesdk case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Signed-off-by: Scott Garman Signed-off-by: Richard Purdie --- meta/classes/useradd.bbclass | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'meta/classes/useradd.bbclass') diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 0f9b84ca06..a8a1c14f48 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): -- cgit 1.2.3-korg