diff options
author | Jörg Sommer <joerg.sommer@navimatix.de> | 2023-10-20 09:48:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-23 10:49:19 +0100 |
commit | 90ac8a0c66833a7afcf78bacd3af09bf0a09fc8e (patch) | |
tree | 1e73dede2503012575dab661ebfc1e0fc6da2c42 /meta/classes-global | |
parent | 91acd29313f714022b0f72c11612d82769e59324 (diff) | |
download | poky-90ac8a0c66833a7afcf78bacd3af09bf0a09fc8e.tar.gz |
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.
(From OE-Core rev: 330dc61053afae8a1812bda6f9e01e2f09d1f08f)
Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-global')
-rw-r--r-- | meta/classes-global/insane.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
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): | |||
923 | 923 | ||
924 | if "file-rdeps" not in skip: | 924 | if "file-rdeps" not in skip: |
925 | ignored_file_rdeps = set(['/bin/sh', '/usr/bin/env', 'rtld(GNU_HASH)']) | 925 | ignored_file_rdeps = set(['/bin/sh', '/usr/bin/env', 'rtld(GNU_HASH)']) |
926 | if bb.utils.contains('DISTRO_FEATURES', 'usrmerge', True, False, d): | ||
927 | ignored_file_rdeps |= set(['/usr/bin/sh']) | ||
926 | if bb.data.inherits_class('nativesdk', d): | 928 | if bb.data.inherits_class('nativesdk', d): |
927 | ignored_file_rdeps |= set(['/bin/bash', '/usr/bin/perl', 'perl']) | 929 | ignored_file_rdeps |= set(['/bin/bash', '/usr/bin/perl', 'perl']) |
930 | if bb.utils.contains('DISTRO_FEATURES', 'usrmerge', True, False, d): | ||
931 | ignored_file_rdeps |= set(['/usr/bin/bash']) | ||
928 | # For Saving the FILERDEPENDS | 932 | # For Saving the FILERDEPENDS |
929 | filerdepends = {} | 933 | filerdepends = {} |
930 | rdep_data = oe.packagedata.read_subpkgdata(pkg, d) | 934 | rdep_data = oe.packagedata.read_subpkgdata(pkg, d) |