diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-21 13:59:19 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-31 21:11:43 +0100 |
| commit | c5a9efca9671ce0c526701463f480dbb387aacce (patch) | |
| tree | f08c865ad844acf9adb46eb308e93fc4a6eab25c | |
| parent | 15905aec48806660c7ad1c8de0c50b7b776270c7 (diff) | |
| download | poky-c5a9efca9671ce0c526701463f480dbb387aacce.tar.gz | |
useradd: Ensure -native recipes don't depend on target recipes
Without this change, dbus-native can end up depending upon base-passwd
for example. This change mirrors the existing nativesdk code.
Based on a patch from Henning Heinold <heinold@inf.fu-berlin.de>
but with some additions from me.
(From OE-Core rev: eba81d1c606ec29ffb793c1cb3cfed9562d552bc)
(From OE-Core rev: b325378930655beeec03bbc5ce6ccf2b29f408fd)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/useradd.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index f3dd8236ee..4e4ac032e4 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | # and support files needed to add and modify user and group accounts | 3 | # and support files needed to add and modify user and group accounts |
| 4 | DEPENDS_append = "${USERADDDEPENDS}" | 4 | DEPENDS_append = "${USERADDDEPENDS}" |
| 5 | USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow" | 5 | USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow" |
| 6 | USERADDDEPENDS_virtclass-native = "" | ||
| 6 | USERADDDEPENDS_virtclass-nativesdk = "" | 7 | USERADDDEPENDS_virtclass-nativesdk = "" |
| 7 | 8 | ||
| 8 | # This preinstall function will be run in two contexts: once for the | 9 | # This preinstall function will be run in two contexts: once for the |
| @@ -97,9 +98,11 @@ useradd_sysroot_sstate () { | |||
| 97 | 98 | ||
| 98 | do_install[prefuncs] += "${SYSROOTFUNC}" | 99 | do_install[prefuncs] += "${SYSROOTFUNC}" |
| 99 | SYSROOTFUNC = "useradd_sysroot" | 100 | SYSROOTFUNC = "useradd_sysroot" |
| 101 | SYSROOTFUNC_virtclass-native = "" | ||
| 100 | SYSROOTFUNC_virtclass-nativesdk = "" | 102 | SYSROOTFUNC_virtclass-nativesdk = "" |
| 101 | SSTATEPOSTINSTFUNCS += "${SYSROOTPOSTFUNC}" | 103 | SSTATEPOSTINSTFUNCS += "${SYSROOTPOSTFUNC}" |
| 102 | SYSROOTPOSTFUNC = "useradd_sysroot_sstate" | 104 | SYSROOTPOSTFUNC = "useradd_sysroot_sstate" |
| 105 | SYSROOTPOSTFUNC_virtclass-native = "" | ||
| 103 | SYSROOTPOSTFUNC_virtclass-nativesdk = "" | 106 | SYSROOTPOSTFUNC_virtclass-nativesdk = "" |
| 104 | 107 | ||
| 105 | # Recipe parse-time sanity checks | 108 | # Recipe parse-time sanity checks |
