diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2016-06-17 16:59:02 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-29 19:36:02 +0100 |
commit | ba29029581eaa4534d85c090d6924d24e4386dbc (patch) | |
tree | 0b2ab7b5d31f48d21e0732fd79bfbdf3b7ee3e80 /meta/classes/useradd-staticids.bbclass | |
parent | a4d74c100d8dfbbc8d682e223c91573a2acca8e3 (diff) | |
download | poky-ba29029581eaa4534d85c090d6924d24e4386dbc.tar.gz |
useradd-staticids.bbclass: Allow missing UIDs/GIDs to generate warnings
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)
(From OE-Core rev: 5a37852e4ab3a7438cab372b288663535ecdfee1)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3037e0df9b1a0e1cb5332ab8026245b61515fc33)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/useradd-staticids.bbclass')
-rw-r--r-- | meta/classes/useradd-staticids.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index 50a7481a60..92b290c186 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass | |||
@@ -47,9 +47,12 @@ def update_useradd_static_config(d): | |||
47 | return id_table | 47 | return id_table |
48 | 48 | ||
49 | def handle_missing_id(id, type, pkg): | 49 | def handle_missing_id(id, type, pkg): |
50 | if d.getVar('USERADD_ERROR_DYNAMIC', True) == '1': | 50 | # For backwards compatibility we accept "1" in addition to "error" |
51 | if d.getVar('USERADD_ERROR_DYNAMIC', True) == 'error' or d.getVar('USERADD_ERROR_DYNAMIC', True) == '1': | ||
51 | #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)) | 52 | #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)) |
52 | raise bb.build.FuncFailed("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id)) | 53 | raise bb.build.FuncFailed("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id)) |
54 | elif d.getVar('USERADD_ERROR_DYNAMIC', True) == 'warn': | ||
55 | bb.warn("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id)) | ||
53 | 56 | ||
54 | # We parse and rewrite the useradd components | 57 | # We parse and rewrite the useradd components |
55 | def rewrite_useradd(params): | 58 | def rewrite_useradd(params): |