summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-04-05 17:10:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-06 10:29:23 +0100
commit37f4f5b8c7cb80e2e5115379995afc476da27cd0 (patch)
treee356972d345d2cd1928b2d4b4b71c3c124ca79ca
parent2ed2089c9b2a9a680434a6d29c312b347604fec5 (diff)
downloadpoky-37f4f5b8c7cb80e2e5115379995afc476da27cd0.tar.gz
package: do_split_packages: expand variables in extra_depends
If a recipe passes for example extra_depends="${PN}-dev" to do_split_packages() then it isn't expanded, so the check for the multilib prefix doesn't work. Solve this centrally by expanding extra_depends inside do_split_packages(). [ YOCTO #9381 ] (From OE-Core rev: d3875a8111f1d88dcc83219d4700784050988ca3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index bdbe96d4cb..4452e2f4f4 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -123,6 +123,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
123 dvar = d.getVar('PKGD', True) 123 dvar = d.getVar('PKGD', True)
124 root = d.expand(root) 124 root = d.expand(root)
125 output_pattern = d.expand(output_pattern) 125 output_pattern = d.expand(output_pattern)
126 extra_depends = d.expand(extra_depends)
126 127
127 # If the root directory doesn't exist, don't error out later but silently do 128 # If the root directory doesn't exist, don't error out later but silently do
128 # no splitting. 129 # no splitting.