diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-31 17:45:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-01 11:27:06 +0100 |
commit | 44607330cdb3e426e6ea6ce9d6df682597b3ff88 (patch) | |
tree | b6affced1759112cf1020a1435e6e8508ad1046a /meta | |
parent | 72cc2de0d97dec48e17a415b0eb6bf7d110e66f6 (diff) | |
download | poky-44607330cdb3e426e6ea6ce9d6df682597b3ff88.tar.gz |
useradd: Ensure do_populate_sysroot has dependency on useradd variables
The do_populate_sysroot task doesn't rerun if you change any of the USERADD_PARAM
or GROUPADD_PARAM variables, only do_package will.
If another task depends on the recipe, this means it won't see any updated changes.
This patch adds in the missing vardeps ensuring the code is deterministic.
[YOCTO #13232]
(From OE-Core rev: 37d0382a3c67f47f8cfdd977a041069bf912b8c3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/useradd.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 5e600dec84..e5f3ba24f9 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
@@ -184,6 +184,7 @@ def update_useradd_after_parse(d): | |||
184 | bb.fatal("%s inherits useradd but doesn't set USERADD_PACKAGES" % d.getVar('FILE', False)) | 184 | bb.fatal("%s inherits useradd but doesn't set USERADD_PACKAGES" % d.getVar('FILE', False)) |
185 | 185 | ||
186 | for pkg in useradd_packages.split(): | 186 | for pkg in useradd_packages.split(): |
187 | d.appendVarFlag("do_populate_sysroot", "vardeps", "USERADD_PARAM_%s GROUPADD_PARAM_%s GROUPMEMS_PARAM_%s" % (pkg, pkg, pkg)) | ||
187 | if not d.getVar('USERADD_PARAM_%s' % pkg) and not d.getVar('GROUPADD_PARAM_%s' % pkg) and not d.getVar('GROUPMEMS_PARAM_%s' % pkg): | 188 | if not d.getVar('USERADD_PARAM_%s' % pkg) and not d.getVar('GROUPADD_PARAM_%s' % pkg) and not d.getVar('GROUPMEMS_PARAM_%s' % pkg): |
188 | bb.fatal("%s inherits useradd but doesn't set USERADD_PARAM, GROUPADD_PARAM or GROUPMEMS_PARAM for package %s" % (d.getVar('FILE', False), pkg)) | 189 | bb.fatal("%s inherits useradd but doesn't set USERADD_PARAM, GROUPADD_PARAM or GROUPMEMS_PARAM for package %s" % (d.getVar('FILE', False), pkg)) |
189 | 190 | ||