[OE-core] [PATCH 1/1] useradd{-static}: Ignore useradds on nativesdk
Mark Hatle
mark.hatle at windriver.com
Thu Mar 20 19:19:02 UTC 2014
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 at windriver.com>
---
meta/classes/useradd-staticids.bbclass | 3 ++-
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 3efe2a8..a89cb10 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 b5f3768..3dd7a61 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)
--
1.8.5.3
More information about the Openembedded-core
mailing list