From 3132d8b52eb05b03df4d4589f94cff38ab69b81d Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 15 Nov 2013 10:31:56 +0800 Subject: xorg-driver: fix qa issue while multilib enabled - contains Xorg driver but no xorg-abi ... WARNING: QA Issue: Package lib32-xf86-video-vesa contains Xorg driver (vesa_drv.so) but no xorg-abi- dependencies WARNING: QA Issue: Package lib32-xf86-video-intel contains Xorg driver (intel_drv.so) but no xorg-abi- dependencies WARNING: QA Issue: Package lib32-xf86-video-omap contains Xorg driver (omap_drv.so) but no xorg-abi- dependencies WARNING: QA Issue: Package lib32-xf86-video-vmware contains Xorg driver (vmware_drv.so) but no xorg-abi- dependencies WARNING: QA Issue: Package lib32-xf86-video-fbdev contains Xorg driver (fbdev_drv.so) but no xorg-abi- dependencies WARNING: QA Issue: Package lib32-xf86-video-modesetting contains Xorg driver (modesetting_drv.so) but no xorg-abi- dependencies ... In oe-core 87be2314fe0e67a616b4f713106b4ae46931f5cb, it fixed add_abi_depends issue while enable multilib. We did the same thing for qa check: package_qa_check_xorg_driver_abi. [YOCTO #5545] Signed-off-by: Hongxu Jia Signed-off-by: Saul Wold --- meta/classes/insane.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index f9f8deffa3..a51f504f20 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -558,8 +558,9 @@ def package_qa_check_xorg_driver_abi(path, name, d, elf, messages): driverdir = d.expand("${libdir}/xorg/modules/drivers/") if driverdir in path and path.endswith(".so"): + mlprefix = d.getVar('MLPREFIX', True) or '' for rdep in bb.utils.explode_deps(d.getVar('RDEPENDS_' + name, True) or ""): - if rdep.startswith("xorg-abi-"): + if rdep.startswith("%sxorg-abi-" % mlprefix): return messages.append("Package %s contains Xorg driver (%s) but no xorg-abi- dependencies" % (name, os.path.basename(path))) -- cgit v1.2.3