Fix minor problem with useradd and useradd-static
cover Fix minor problem with useradd and useradd-static
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(-)
Signature · 1 line
1.8.5.3
PATCH 1/1 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.
--- meta/classes/useradd-staticids.bbclass | 3 ++- meta/classes/useradd.bbclass | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
meta/classes/useradd-staticids.bbclass +2 -1
@@ -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:
meta/classes/useradd.bbclass +4 -2
@@ -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)
Signature · 1 line
1.8.5.3