summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-07-16 10:02:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 16:18:50 +0100
commit350a8916c3cd3e6a8306f9ad15d7eaff9d597f56 (patch)
tree11606991df6bd8fd297b07f21d61c7fa0b5bc53d /meta
parent9b227ae99123badf137b2b478372aaec16ff4c6f (diff)
downloadpoky-350a8916c3cd3e6a8306f9ad15d7eaff9d597f56.tar.gz
do_split_packages: revise for multilib case
in multilib case, the PACKAGE_DYNAMIC is overrided with multilib prefix. Take multilib:lib64-perl as example. the "perl-module-*" will become "lib64-perl-module-*" the output_pattern in do_split_packages is designed to work with PACKAGE_DYNAMIC, so it should be applied with the same logic, i.e. overriding with multilib prefix. otherwise the do_split_package will split incorrect files this patch implements the mulitlib override logic for do_split_packages We also need to rename the extra_depends to support multilib case (from Dongxaio Xu). (From OE-Core rev: a4bc86713892502aeefbbdb3053e8cf1e1fc0bdb) Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Xu Dongxiao <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass14
1 files changed, 14 insertions, 0 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 0caab6dcf9..bb0ba68e02 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -70,6 +70,20 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
70 given package, usually plugins or modules. 70 given package, usually plugins or modules.
71 """ 71 """
72 72
73 ml = d.getVar("MLPREFIX", True)
74 if ml:
75 if not output_pattern.startswith(ml):
76 output_pattern = ml + output_pattern
77
78 newdeps = []
79 for dep in (extra_depends or "").split():
80 if dep.startswith(ml):
81 newdeps.append(dep)
82 else:
83 newdeps.append(ml + dep)
84 if newdeps:
85 extra_depends = " ".join(newdeps)
86
73 dvar = bb.data.getVar('PKGD', d, True) 87 dvar = bb.data.getVar('PKGD', d, True)
74 88
75 packages = bb.data.getVar('PACKAGES', d, True).split() 89 packages = bb.data.getVar('PACKAGES', d, True).split()