diff options
author | Changqing Li <changqing.li@windriver.com> | 2019-09-16 13:50:23 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-16 23:02:45 +0100 |
commit | da61ee554134f5d56f2deaf42ea0d20d84e36b83 (patch) | |
tree | 5bc0fe84e3a3c7b541a2acdad2d0cfd5465130ad /meta/lib/oe | |
parent | 0b7320b4d392796aa25ce3c00a4c9b3edeac357f (diff) | |
download | poky-da61ee554134f5d56f2deaf42ea0d20d84e36b83.tar.gz |
classextend.py: don't extend file for file dependency
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>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/classextend.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index e25122e815..f02fbe9fba 100644 --- a/meta/lib/oe/classextend.py +++ b/meta/lib/oe/classextend.py | |||
@@ -24,6 +24,8 @@ class ClassExtender(object): | |||
24 | if not subs.startswith(self.extname): | 24 | if not subs.startswith(self.extname): |
25 | return "virtual/" + self.extname + "-" + subs | 25 | return "virtual/" + self.extname + "-" + subs |
26 | return name | 26 | return name |
27 | if name.startswith("/"): | ||
28 | return name | ||
27 | if not name.startswith(self.extname): | 29 | if not name.startswith(self.extname): |
28 | return self.extname + "-" + name | 30 | return self.extname + "-" + name |
29 | return name | 31 | return name |