summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-03-20 14:19:02 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-21 12:05:49 +0000
commit29ee5c139eadd84fbb6b25b577e91bc4aa0c1038 (patch)
treeb494026ed43639f382eef0298630f0b205164c90 /meta/classes
parent49aad7da07e187f206e963001844605731b01247 (diff)
downloadpoky-29ee5c139eadd84fbb6b25b577e91bc4aa0c1038.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. (From OE-Core rev: 6b9705892400a1da1fcd973c64d1911c7c4463f6) 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.bbclass3
-rw-r--r--meta/classes/useradd.bbclass6
2 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
index 3efe2a895a..a89cb10a4a 100644
--- a/meta/classes/useradd-staticids.bbclass
+++ b/meta/classes/useradd-staticids.bbclass
@@ -262,7 +262,8 @@ def update_useradd_static_config(d):
262 262
263 263
264python __anonymous() { 264python __anonymous() {
265 if not bb.data.inherits_class('nativesdk', d): 265 if not bb.data.inherits_class('nativesdk', d) \
266 and not bb.data.inherits_class('native', d):
266 try: 267 try:
267 update_useradd_static_config(d) 268 update_useradd_static_config(d)
268 except bb.build.FuncFailed as f: 269 except bb.build.FuncFailed as f:
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
147python __anonymous() { 147python __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)