summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-23 10:03:54 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-23 23:33:48 (GMT)
commit5281e3f10121771f26f944caeb83cd3789bd7be0 (patch)
tree436988c85ccc859158122ea26404f514507f4a8c /meta/classes/package.bbclass
parentb096bb9399aad23947ce876f59a3d8df66177c3a (diff)
downloadpoky-5281e3f10121771f26f944caeb83cd3789bd7be0.tar.gz
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. (From OE-Core rev: c392401e10ff43d10b7e57c9d552522a02c91878) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-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 1efc396..d4c6a90 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -2171,10 +2171,12 @@ python package_depchains() {
2171# iteration, we need to list them here: 2171# iteration, we need to list them here:
2172PACKAGEVARS = "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" 2172PACKAGEVARS = "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"
2173 2173
2174def gen_packagevar(d): 2174def gen_packagevar(d, pkgvars="PACKAGEVARS"):
2175 ret = [] 2175 ret = []
2176 pkgs = (d.getVar("PACKAGES") or "").split() 2176 pkgs = (d.getVar("PACKAGES") or "").split()
2177 vars = (d.getVar("PACKAGEVARS") or "").split() 2177 vars = (d.getVar(pkgvars) or "").split()
2178 for v in vars:
2179 ret.append(v)
2178 for p in pkgs: 2180 for p in pkgs:
2179 for v in vars: 2181 for v in vars:
2180 ret.append(v + "_" + p) 2182 ret.append(v + "_" + p)