summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2011-11-08 16:46:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-08 16:22:40 +0000
commit140a3507fb5c14cd9bcebe4304f491aa1c5c47a2 (patch)
tree36f6fee3d18622a73734eb3f766ff83dea8b0b48 /meta/classes
parent7736862a74c92fe1afe42e170822be13117575c2 (diff)
downloadopenembedded-core-140a3507fb5c14cd9bcebe4304f491aa1c5c47a2.tar.gz
openembedded-core-140a3507fb5c14cd9bcebe4304f491aa1c5c47a2.tar.bz2
openembedded-core-140a3507fb5c14cd9bcebe4304f491aa1c5c47a2.tar.xz
openembedded-core-140a3507fb5c14cd9bcebe4304f491aa1c5c47a2.zip
useradd.bbclass: handle nativesdk case
* 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/useradd.bbclass12
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 0f9b84ca0..a8a1c14f4 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):