mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

useradd-staticids.bbclass: Allow missing UIDs/GIDs to generate warnings

Browse Source 
Previously when USERADD_ERROR_DYNAMIC was set to "1", an exception was
raised if no numeric UID/GID could be determined for a user/group. Now
it is possible to set it to either "error", which results in the old
behavior, or "warn" in which case a warning is issued instead.

For backwards compatibility reasons, it is still possible to set
USERADD_ERROR_DYNAMIC to "1" and get an exception in case of failure.

(From OE-Core rev: 58c82f79efee8e68fa63b96a32f54660afb15769)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt
2016-06-17 16:59:02 +02:00
committed by Richard Purdie
parent c99750d17e
commit 3037e0df9b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/useradd-staticids.bbclass
+4 -1
View File
@@ -51,9 +51,12 @@ def update_useradd_static_config(d):
return id_table
def handle_missing_id(id, type, pkg):
if d.getVar('USERADD_ERROR_DYNAMIC', True) == '1':
# For backwards compatibility we accept "1" in addition to "error"
if d.getVar('USERADD_ERROR_DYNAMIC', True) == 'error' or d.getVar('USERADD_ERROR_DYNAMIC', True) == '1':
#bb.error("Skipping recipe %s, package %s which adds %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id))
raise bb.build.FuncFailed("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id))
elif d.getVar('USERADD_ERROR_DYNAMIC', True) == 'warn':
bb.warn("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id))
# We parse and rewrite the useradd components
def rewrite_useradd(params):