[PATCH 0/1] Fix minor problem with useradd and useradd-static

[PATCH 0/1] Fix minor problem with useradd and useradd-static

[Mark Hatle]

Fix a minor performance issue with useradd.bbclass, where it evaluated user/
group adds for nativesdk packages -- even though it didn't do them.

Fix a build problem w/ useradd-static, when in enforcing mode the system could
fail to build a nativesdk recipe if the specified user/groups were not present.


The following changes since commit ef196434620522affc11b5b1b867386b5d14a4c3:

  alsa-tools: fix build when x11 and gtk+ not available (2014-03-19 14:41:55 +0000)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib mhatle/uidgid
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mhatle/uidgid

Mark Hatle (1):
  useradd{-static}: Ignore useradds on nativesdk

 meta/classes/useradd-staticids.bbclass | 3 ++-
 meta/classes/useradd.bbclass           | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

-- 
1.8.5.3

[PATCH 1/1] useradd{-static}: Ignore useradds on nativesdk

[Mark Hatle]

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>
---
 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