summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-31 17:45:57 +0100
committerArmin Kuster <akuster808@gmail.com>2019-09-29 21:38:22 -0700
commit7f98309c856e0a54dc9dafda91c9db0a33e57425 (patch)
treead0f315bcdd7c3670cf6967c86907d68f783c56a
parent441a2b8979e69c20e7ed0178cdb210eecdec91e1 (diff)
downloadopenembedded-core-7f98309c856e0a54dc9dafda91c9db0a33e57425.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] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 37d0382a3c67f47f8cfdd977a041069bf912b8c3) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/classes/useradd.bbclass1
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):
bb.fatal("%s inherits useradd but doesn't set USERADD_PACKAGES" % d.getVar('FILE', False))
for pkg in useradd_packages.split():
+ d.appendVarFlag("do_populate_sysroot", "vardeps", "USERADD_PARAM_%s GROUPADD_PARAM_%s GROUPMEMS_PARAM_%s" % (pkg, pkg, pkg))
if not d.getVar('USERADD_PARAM_%s' % pkg) and not d.getVar('GROUPADD_PARAM_%s' % pkg) and not d.getVar('GROUPMEMS_PARAM_%s' % pkg):
bb.fatal("%s inherits useradd but doesn't set USERADD_PARAM, GROUPADD_PARAM or GROUPMEMS_PARAM for package %s" % (d.getVar('FILE', False), pkg))