diff options
author | Thomas Fitzsimmons <fitzsim@cisco.com> | 2013-09-05 23:41:20 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-06 23:04:48 +0100 |
commit | f24dda3de90696c5dc33170bcdaa83137cafff9d (patch) | |
tree | 0a59afbeb8b2a5182bfa5e9e2d3ad82a3e560dfb /meta/classes | |
parent | 0fa12e44663c9e27de7d2c33be9132127679d0d3 (diff) | |
download | poky-f24dda3de90696c5dc33170bcdaa83137cafff9d.tar.gz |
useradd: Handle users from a package being used in others
If there is a package A (TUNE_PKGARCH) which is depended upon by B which
is MACHINE_ARCH and you build B for machine X, then Y, the user isn't
present in the sysroot for machine Y since the useradd code is never
triggered.
The change ensures the code does get triggered and the user is present.
[YOCTO 4739]
(From OE-Core rev: 5871337da49f8cd1eaf53f7cd0aacc026dc7bcdb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/useradd.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index eabfc5d397..a850e9db6a 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
@@ -101,7 +101,7 @@ useradd_sysroot () { | |||
101 | } | 101 | } |
102 | 102 | ||
103 | useradd_sysroot_sstate () { | 103 | useradd_sysroot_sstate () { |
104 | if [ "${BB_CURRENTTASK}" = "package_setscene" ] | 104 | if [ "${BB_CURRENTTASK}" = "package_setscene" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] |
105 | then | 105 | then |
106 | useradd_sysroot | 106 | useradd_sysroot |
107 | fi | 107 | fi |
@@ -123,6 +123,7 @@ USERADDSETSCENEDEPS_virtclass-cross = "" | |||
123 | USERADDSETSCENEDEPS_class-native = "" | 123 | USERADDSETSCENEDEPS_class-native = "" |
124 | USERADDSETSCENEDEPS_class-nativesdk = "" | 124 | USERADDSETSCENEDEPS_class-nativesdk = "" |
125 | do_package_setscene[depends] += "${USERADDSETSCENEDEPS}" | 125 | do_package_setscene[depends] += "${USERADDSETSCENEDEPS}" |
126 | do_populate_sysroot_setscene[depends] += "${USERADDSETSCENEDEPS}" | ||
126 | 127 | ||
127 | # Recipe parse-time sanity checks | 128 | # Recipe parse-time sanity checks |
128 | def update_useradd_after_parse(d): | 129 | def update_useradd_after_parse(d): |