diff options
Diffstat (limited to 'meta/classes/useradd.bbclass')
-rw-r--r-- | meta/classes/useradd.bbclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index b5f37688fe..3dd7a610a9 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
@@ -145,7 +145,8 @@ def update_useradd_after_parse(d): | |||
145 | bb.fatal("%s inherits useradd but doesn't set USERADD_PARAM, GROUPADD_PARAM or GROUPMEMS_PARAM for package %s" % (d.getVar('FILE'), pkg)) | 145 | bb.fatal("%s inherits useradd but doesn't set USERADD_PARAM, GROUPADD_PARAM or GROUPMEMS_PARAM for package %s" % (d.getVar('FILE'), pkg)) |
146 | 146 | ||
147 | python __anonymous() { | 147 | python __anonymous() { |
148 | if not bb.data.inherits_class('nativesdk', d): | 148 | if not bb.data.inherits_class('nativesdk', d) \ |
149 | and not bb.data.inherits_class('native', d): | ||
149 | update_useradd_after_parse(d) | 150 | update_useradd_after_parse(d) |
150 | } | 151 | } |
151 | 152 | ||
@@ -197,7 +198,8 @@ fakeroot python populate_packages_prepend () { | |||
197 | 198 | ||
198 | # Add the user/group preinstall scripts and RDEPENDS requirements | 199 | # Add the user/group preinstall scripts and RDEPENDS requirements |
199 | # to packages specified by USERADD_PACKAGES | 200 | # to packages specified by USERADD_PACKAGES |
200 | if not bb.data.inherits_class('nativesdk', d): | 201 | if not bb.data.inherits_class('nativesdk', d) \ |
202 | and not bb.data.inherits_class('native', d): | ||
201 | useradd_packages = d.getVar('USERADD_PACKAGES', True) or "" | 203 | useradd_packages = d.getVar('USERADD_PACKAGES', True) or "" |
202 | for pkg in useradd_packages.split(): | 204 | for pkg in useradd_packages.split(): |
203 | update_useradd_package(pkg) | 205 | update_useradd_package(pkg) |