summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-23 10:03:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-23 23:33:43 +0000
commitc392401e10ff43d10b7e57c9d552522a02c91878 (patch)
tree28689d02c6aed615af35639b6bc7640bc1079f74
parente21021dc00ec76c76cc361e15bc83a89083c9e72 (diff)
downloadopenembedded-core-contrib-c392401e10ff43d10b7e57c9d552522a02c91878.tar.gz
openembedded-core-contrib-c392401e10ff43d10b7e57c9d552522a02c91878.tar.bz2
openembedded-core-contrib-c392401e10ff43d10b7e57c9d552522a02c91878.zip
package: Correct variable dependecies
Ensure that the plain variable X is also added to the dependencies as well as X_<pkg>. Allow the funciton to be called with a different variable list too. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 1efc396ac6..d4c6a90e84 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -2171,10 +2171,12 @@ python package_depchains() {
# iteration, we need to list them here:
PACKAGEVARS = "FILES RDEPENDS RRECOMMENDS SUMMARY DESCRIPTION RSUGGESTS RPROVIDES RCONFLICTS PKG ALLOW_EMPTY pkg_postinst pkg_postrm pkg_postinst_ontarget INITSCRIPT_NAME INITSCRIPT_PARAMS DEBIAN_NOAUTONAME ALTERNATIVE PKGE PKGV PKGR USERADD_PARAM GROUPADD_PARAM CONFFILES SYSTEMD_SERVICE LICENSE SECTION pkg_preinst pkg_prerm RREPLACES GROUPMEMS_PARAM SYSTEMD_AUTO_ENABLE SKIP_FILEDEPS PRIVATE_LIBS"
-def gen_packagevar(d):
+def gen_packagevar(d, pkgvars="PACKAGEVARS"):
ret = []
pkgs = (d.getVar("PACKAGES") or "").split()
- vars = (d.getVar("PACKAGEVARS") or "").split()
+ vars = (d.getVar(pkgvars) or "").split()
+ for v in vars:
+ ret.append(v)
for p in pkgs:
for v in vars:
ret.append(v + "_" + p)