From 47048bfd6416c6fdeb545f890f38d57a1390450e Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 19 Nov 2019 11:15:14 +0800 Subject: multilib.bbclass: fix qa warning of kernel-devicetree When kernel-devicetree is in RRECOMMENDS such as via variable MACHINE_EXTRA_RRECOMMENDS for some bsp, it shows QA warning of multilib: | WARNING: lib32-packagegroup-base-1.0-r83 do_package: QA Issue: | lib32-packagegroup-base package lib32-packagegroup-machine-base | - suspicious values 'kernel-devicetree' in RRECOMMENDS [multilib] Add kernel-devicetree to exceptions to fix the QA issue. Because there are already 3 kernel related criteria, simplify them by judging package names whether start with 'kernel-'. And also refactor to remove duplicate 'not'. (From OE-Core rev: 5e4504026c6358c7d5649843dc354247f5972558) Signed-off-by: Kai Kang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/multilib.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'meta/classes/multilib.bbclass') diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 1a9295d36f..ee677da1e2 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -184,11 +184,12 @@ python do_package_qa_multilib() { for i in values: if i.startswith('virtual/'): i = i[len('virtual/'):] - if (not i.startswith('kernel-module')) and (not i.startswith(mlprefix)) and \ - (not 'cross-canadian' in i) and (not i.startswith("nativesdk-")) and \ - (not i.startswith("rtld")) and (not i.startswith('kernel-vmlinux')) \ - and (not i.startswith("kernel-image")) and (not i.startswith("/")): + + if (not (i.startswith(mlprefix) or i.startswith("kernel-") \ + or ('cross-canadian' in i) or i.startswith("nativesdk-") \ + or i.startswith("rtld") or i.startswith("/"))): candidates.append(i) + if len(candidates) > 0: msg = "%s package %s - suspicious values '%s' in %s" \ % (d.getVar('PN'), pkg, ' '.join(candidates), var) -- cgit v1.2.3-54-g00ecf