summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2016-07-28 11:43:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-01 11:46:37 +0100
commit799c93592a9aac571d6dc05529437c0eec7b08b8 (patch)
tree5e3919d5a264de1738a40e23e64bf8ac1b1a160c
parentf2a04faf3c5d0a3cc562061b22e1c4873e1ca769 (diff)
downloadopenembedded-core-contrib-799c93592a9aac571d6dc05529437c0eec7b08b8.tar.gz
openembedded-core-contrib-799c93592a9aac571d6dc05529437c0eec7b08b8.tar.bz2
openembedded-core-contrib-799c93592a9aac571d6dc05529437c0eec7b08b8.zip
useradd-staticids.bbclass: trigger reparsing when table files change
This addresses (among others) the following problem: - USERADD_ERROR_DYNAMIC=error causes a recipe to get skipped because a static ID entry is missing - the entry gets added to the file - using the recipe still fails with the same error as before because the recipe gets loaded from the cache instead of re-parsing it with the new table content Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/useradd-staticids.bbclass13
1 files changed, 13 insertions, 0 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
index 149245b292..46d4a4b3da 100644
--- a/meta/classes/useradd-staticids.bbclass
+++ b/meta/classes/useradd-staticids.bbclass
@@ -285,6 +285,19 @@ def update_useradd_static_config(d):
return ";".join(newparams).strip()
+ # The parsing of the current recipe depends on the content of
+ # the files listed in USERADD_UID/GID_TABLES. We need to tell bitbake
+ # about that explicitly to trigger re-parsing and thus re-execution of
+ # this code when the files change.
+ bbpath = d.getVar('BBPATH', True)
+ for varname, default in (('USERADD_UID_TABLES', 'files/passwd'),
+ ('USERADD_GID_TABLES', 'files/group')):
+ tables = d.getVar(varname, True)
+ if not tables:
+ tables = default
+ for conf_file in tables.split():
+ bb.parse.mark_dependency(d, bb.utils.which(bbpath, conf_file))
+
# Load and process the users and groups, rewriting the adduser/addgroup params
useradd_packages = d.getVar('USERADD_PACKAGES', True)