diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2014-03-20 14:19:02 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-20 22:17:43 +0000 |
| commit | 6b9705892400a1da1fcd973c64d1911c7c4463f6 (patch) | |
| tree | 58b88c29f22dddd38275fe1a2eab1c5343d7dd2b /meta/classes | |
| parent | ef196434620522affc11b5b1b867386b5d14a4c3 (diff) | |
| download | openembedded-core-contrib-6b9705892400a1da1fcd973c64d1911c7c4463f6.tar.gz | |
useradd{-static}: Ignore useradds on nativesdk
The code was supposed to ignore both native and nativesdk operations when
using the useradd and useradd-static code. However, somewhere along the way
the code was dropped. This didn't cause any issues until someone enabled the
enforcing mode in the new useradd-static and various nativesdk packages
started to fail.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/useradd-staticids.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/useradd.bbclass | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index 3efe2a895ad..a89cb10a4a6 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass @@ -262,7 +262,8 @@ def update_useradd_static_config(d): python __anonymous() { - if not bb.data.inherits_class('nativesdk', d): + if not bb.data.inherits_class('nativesdk', d) \ + and not bb.data.inherits_class('native', d): try: update_useradd_static_config(d) except bb.build.FuncFailed as f: diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index b5f37688fe7..3dd7a610a91 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -145,7 +145,8 @@ def update_useradd_after_parse(d): bb.fatal("%s inherits useradd but doesn't set USERADD_PARAM, GROUPADD_PARAM or GROUPMEMS_PARAM for package %s" % (d.getVar('FILE'), pkg)) python __anonymous() { - if not bb.data.inherits_class('nativesdk', d): + if not bb.data.inherits_class('nativesdk', d) \ + and not bb.data.inherits_class('native', d): update_useradd_after_parse(d) } @@ -197,7 +198,8 @@ fakeroot python populate_packages_prepend () { # Add the user/group preinstall scripts and RDEPENDS requirements # to packages specified by USERADD_PACKAGES - if not bb.data.inherits_class('nativesdk', d): + if not bb.data.inherits_class('nativesdk', d) \ + and not bb.data.inherits_class('native', d): useradd_packages = d.getVar('USERADD_PACKAGES', True) or "" for pkg in useradd_packages.split(): update_useradd_package(pkg) |