From 3037e0df9b1a0e1cb5332ab8026245b61515fc33 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Fri, 17 Jun 2016 16:59:02 +0200 Subject: 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) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/classes/useradd-staticids.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index 90835cfac2..b6e498c0ce 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass @@ -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): -- cgit v1.2.3-54-g00ecf