diff options
| -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) |
