Patchwork [3/8] do_split_packages: revise for multilib case

login
register
mail settings
Submitter Richard Purdie
Date July 26, 2011, 9:53 p.m.
Message ID <ed492b5beb3b49540ba355341a51b017282032c5.1311716946.git.richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/8609/
State New, archived
Headers show

Comments

Richard Purdie - July 26, 2011, 9:53 p.m.
From: Yu Ke <ke.yu@intel.com>

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

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Xu Dongxiao <dongxiao.xu@intel.com>
---
 meta/classes/package.bbclass |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Patch

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index ea8ad05..99c60e8 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -70,6 +70,10 @@  def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 	given package, usually plugins or modules.
 	"""
 
+	ml = d.getVar("MLPREFIX", True)
+	if ml and not output_pattern.startswith(ml):
+		output_pattern = ml + output_pattern
+
 	dvar = bb.data.getVar('PKGD', d, True)
 
 	packages = bb.data.getVar('PACKAGES', d, True).split()