summaryrefslogtreecommitdiffstats
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:48 +0000
commitd5175bb3ede9db4dc41fddb4fe05008dd73ce53c (patch)
tree8d3d557f0aa0c999cb6754b836e4aa0910062de1
parent1ef442561d9784209f56e8c283824c1f2de3e2d1 (diff)
downloadpoky-d5175bb3ede9db4dc41fddb4fe05008dd73ce53c.tar.gz
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 (From OE-Core rev: 140a3507fb5c14cd9bcebe4304f491aa1c5c47a2) 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>
-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 0f9b84ca06..a8a1c14f48 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -3,7 +3,9 @@ USERADDPN ?= "${PN}"
3# base-passwd-cross provides the default passwd and group files in the 3# base-passwd-cross provides the default passwd and group files in the
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 = "${USERADDDEPENDS}"
7USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot"
8USERADDDEPENDS_virtclass-nativesdk = ""
7 9
8# This preinstall function will be run in two contexts: once for the 10# This preinstall function will be run in two contexts: once for the
9# native sysroot (as invoked by the useradd_sysroot() wrapper), and 11# native sysroot (as invoked by the useradd_sysroot() wrapper), and
@@ -95,8 +97,12 @@ useradd_sysroot_sstate () {
95 fi 97 fi
96} 98}
97 99
98do_install[prefuncs] += "useradd_sysroot" 100do_install[prefuncs] += "${SYSROOTFUNC}"
99SSTATEPOSTINSTFUNCS += "useradd_sysroot_sstate" 101SYSROOTFUNC = "useradd_sysroot"
102SYSROOTFUNC_virtclass-nativesdk = ""
103SSTATEPOSTINSTFUNCS += "${SYSROOTPOSTFUNC}"
104SYSROOTPOSTFUNC = "useradd_sysroot_sstate"
105SYSROOTPOSTFUNC_virtclass-nativesdk = ""
100 106
101# Recipe parse-time sanity checks 107# Recipe parse-time sanity checks
102def update_useradd_after_parse(d): 108def update_useradd_after_parse(d):