From: Jörg Sommer Date: Fri, 20 Oct 2023 07:48:41 +0000 (+0200) Subject: package_qa_check_rdepends: Allow /usr/bin/sh if usrmerge X-Git-Tag: yocto-5.2~4792 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=330dc61053afae8a1812bda6f9e01e2f09d1f08f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git package_qa_check_rdepends: Allow /usr/bin/sh if usrmerge 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. Signed-off-by: Jörg Sommer Signed-off-by: Alexandre Belloni --- diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index 6f3cd3026de..ecc868a4e07 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)