diff options
| -rw-r--r-- | meta/classes/insane.bbclass | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index c6dea22618..0b45374a28 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
| @@ -771,31 +771,32 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d): | |||
| 771 | rdepends = bb.utils.explode_deps(localdata.getVar('RDEPENDS', True) or "") | 771 | rdepends = bb.utils.explode_deps(localdata.getVar('RDEPENDS', True) or "") |
| 772 | 772 | ||
| 773 | # Now do the sanity check!!! | 773 | # Now do the sanity check!!! |
| 774 | for rdepend in rdepends: | 774 | if "build-deps" not in skip: |
| 775 | if "-dbg" in rdepend and "debug-deps" not in skip: | 775 | for rdepend in rdepends: |
| 776 | error_msg = "%s rdepends on %s" % (pkg,rdepend) | 776 | if "-dbg" in rdepend and "debug-deps" not in skip: |
| 777 | sane = package_qa_handle_error("debug-deps", error_msg, d) | 777 | error_msg = "%s rdepends on %s" % (pkg,rdepend) |
| 778 | if (not "-dev" in pkg and not "-staticdev" in pkg) and rdepend.endswith("-dev") and "dev-deps" not in skip: | 778 | sane = package_qa_handle_error("debug-deps", error_msg, d) |
| 779 | error_msg = "%s rdepends on %s" % (pkg, rdepend) | 779 | if (not "-dev" in pkg and not "-staticdev" in pkg) and rdepend.endswith("-dev") and "dev-deps" not in skip: |
| 780 | sane = package_qa_handle_error("dev-deps", error_msg, d) | 780 | error_msg = "%s rdepends on %s" % (pkg, rdepend) |
| 781 | if rdepend not in packages: | 781 | sane = package_qa_handle_error("dev-deps", error_msg, d) |
| 782 | rdep_data = oe.packagedata.read_subpkgdata(rdepend, d) | 782 | if rdepend not in packages: |
| 783 | if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps: | 783 | rdep_data = oe.packagedata.read_subpkgdata(rdepend, d) |
| 784 | continue | 784 | if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps: |
| 785 | if not rdep_data or not 'PN' in rdep_data: | 785 | continue |
| 786 | pkgdata_dir = d.getVar("PKGDATA_DIR", True) | 786 | if not rdep_data or not 'PN' in rdep_data: |
| 787 | try: | 787 | pkgdata_dir = d.getVar("PKGDATA_DIR", True) |
| 788 | possibles = os.listdir("%s/runtime-rprovides/%s/" % (pkgdata_dir, rdepend)) | 788 | try: |
| 789 | except OSError: | 789 | possibles = os.listdir("%s/runtime-rprovides/%s/" % (pkgdata_dir, rdepend)) |
| 790 | possibles = [] | 790 | except OSError: |
| 791 | for p in possibles: | 791 | possibles = [] |
| 792 | rdep_data = oe.packagedata.read_subpkgdata(p, d) | 792 | for p in possibles: |
| 793 | if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps: | 793 | rdep_data = oe.packagedata.read_subpkgdata(p, d) |
| 794 | break | 794 | if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps: |
| 795 | if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps: | 795 | break |
| 796 | continue | 796 | if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps: |
| 797 | error_msg = "%s rdepends on %s, but it isn't a build dependency?" % (pkg, rdepend) | 797 | continue |
| 798 | sane = package_qa_handle_error("build-deps", error_msg, d) | 798 | error_msg = "%s rdepends on %s, but it isn't a build dependency?" % (pkg, rdepend) |
| 799 | sane = package_qa_handle_error("build-deps", error_msg, d) | ||
| 799 | 800 | ||
| 800 | if "file-rdeps" not in skip: | 801 | if "file-rdeps" not in skip: |
| 801 | ignored_file_rdeps = set(['/bin/sh', '/usr/bin/env', 'rtld(GNU_HASH)']) | 802 | ignored_file_rdeps = set(['/bin/sh', '/usr/bin/env', 'rtld(GNU_HASH)']) |
