mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

classextend.py: don't extend file for file dependency

Browse Source 
Fix error like:
lib32-e2fsprogs-1.45.3-r0 do_package_qa: QA Issue: /usr/sbin/e2scrub_all
contained in package lib32-e2fsprogs-e2scrub requires /bin/bash,
but no providers found in RDEPENDS_lib32-e2fsprogs-e2scrub

For some lib32 packages(eg: lib32-bash, lib32-sed) which probvides files,
extend is not needed

Eg: RPROVIDES of lib32-bash expects to have /bin/bash, with original
extend, it will become lib32-/bin/bash, then will cause above error

Fix by don't extend file dependency, and skip multilib check for file dependency
in do_package_qa to avoid error like:
WARNING: lib32-bash-5.0-r0 do_package: QA Issue: lib32-bash package lib32-bash
 - suspicious values '/bin/bash /bin/sh' in RPROVIDES [multilib]

(From OE-Core rev: a9163120ed52534e7dbf4db50dc2b03bbf69f06b)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Changqing Li
2019-09-16 13:50:23 +08:00
committed by Richard Purdie
parent 0b7320b4d3
commit da61ee5541
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/multilib.bbclass
+1 -1
View File
@@ -187,7 +187,7 @@ python do_package_qa_multilib() {
if (not i.startswith('kernel-module')) and (not i.startswith(mlprefix)) and \ if (not i.startswith('kernel-module')) and (not i.startswith(mlprefix)) and \
(not 'cross-canadian' in i) and (not i.startswith("nativesdk-")) and \ (not 'cross-canadian' in i) and (not i.startswith("nativesdk-")) and \
(not i.startswith("rtld")) and (not i.startswith('kernel-vmlinux')) \ (not i.startswith("rtld")) and (not i.startswith('kernel-vmlinux')) \
and (not i.startswith("kernel-image")): and (not i.startswith("kernel-image")) and (not i.startswith("/")):
candidates.append(i) candidates.append(i)
if len(candidates) > 0: if len(candidates) > 0:
msg = "%s package %s - suspicious values '%s' in %s" \ msg = "%s package %s - suspicious values '%s' in %s" \
meta/lib/oe/classextend.py
+2
View File
@@ -24,6 +24,8 @@ class ClassExtender(object):
if not subs.startswith(self.extname): if not subs.startswith(self.extname):
return "virtual/" + self.extname + "-" + subs return "virtual/" + self.extname + "-" + subs
return name return name
if name.startswith("/"):
return name
if not name.startswith(self.extname): if not name.startswith(self.extname):
return self.extname + "-" + name return self.extname + "-" + name
return name return name