From 90ac8a0c66833a7afcf78bacd3af09bf0a09fc8e Mon Sep 17 00:00:00 2001 From: Jörg Sommer Date: Fri, 20 Oct 2023 09:48:41 +0200 Subject: package_qa_check_rdepends: Allow /usr/bin/sh if usrmerge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the distro feature usrmerge is set, all files from /bin are moved to /usr/bin, i.e. /usr/bin/sh is the same as /bin/sh and should be allowed be ignored, because it's always present. (From OE-Core rev: 330dc61053afae8a1812bda6f9e01e2f09d1f08f) Signed-off-by: Jörg Sommer Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes-global/insane.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/classes-global') diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index 6f3cd3026d..ecc868a4e0 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -923,8 +923,12 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d): if "file-rdeps" not in skip: ignored_file_rdeps = set(['/bin/sh', '/usr/bin/env', 'rtld(GNU_HASH)']) + if bb.utils.contains('DISTRO_FEATURES', 'usrmerge', True, False, d): + ignored_file_rdeps |= set(['/usr/bin/sh']) if bb.data.inherits_class('nativesdk', d): ignored_file_rdeps |= set(['/bin/bash', '/usr/bin/perl', 'perl']) + if bb.utils.contains('DISTRO_FEATURES', 'usrmerge', True, False, d): + ignored_file_rdeps |= set(['/usr/bin/bash']) # For Saving the FILERDEPENDS filerdepends = {} rdep_data = oe.packagedata.read_subpkgdata(pkg, d) -- cgit v1.2.3-54-g00ecf