summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-01 14:13:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 11:40:52 +0100
commit0bfb2094e3eadc85358a354d12b211ff69612a61 (patch)
treea3373842354d9152e50fc267e61e066ccbc3407f
parent35e6121a58705381ddd0d86d69bdbbac9da51b37 (diff)
downloadpoky-0bfb2094e3eadc85358a354d12b211ff69612a61.tar.gz
insane.bbclass: Remove copy and paste confusion when using OVERRIDES
People keep copying this code and its confusing and unnecessary. Remove the bad examples to try and stop this happening. (From OE-Core rev: 48aa4b00cfb7f01195c6d20b7ba660715fe792ef) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/insane.bbclass17
1 files changed, 2 insertions, 15 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 1fb89704a3..b1e68b23fc 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -628,33 +628,20 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, d):
628 628
629 sane = True 629 sane = True
630 if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg: 630 if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg:
631 # Copied from package_ipk.bbclass
632 # boiler plate to update the data
633 localdata = bb.data.createCopy(d) 631 localdata = bb.data.createCopy(d)
634 root = "%s/%s" % (pkgdest, pkg)
635
636 localdata.setVar('ROOT', '')
637 localdata.setVar('ROOT_%s' % pkg, root)
638 pkgname = localdata.getVar('PKG_%s' % pkg, True)
639 if not pkgname:
640 pkgname = pkg
641 localdata.setVar('PKG', pkgname)
642
643 localdata.setVar('OVERRIDES', pkg) 632 localdata.setVar('OVERRIDES', pkg)
644
645 bb.data.update_data(localdata) 633 bb.data.update_data(localdata)
646 634
647 # Now check the RDEPENDS 635 # Now check the RDEPENDS
648 rdepends = bb.utils.explode_deps(localdata.getVar('RDEPENDS', True) or "") 636 rdepends = bb.utils.explode_deps(localdata.getVar('RDEPENDS', True) or "")
649 637
650
651 # Now do the sanity check!!! 638 # Now do the sanity check!!!
652 for rdepend in rdepends: 639 for rdepend in rdepends:
653 if "-dbg" in rdepend and "debug-deps" not in skip: 640 if "-dbg" in rdepend and "debug-deps" not in skip:
654 error_msg = "%s rdepends on %s" % (pkgname,rdepend) 641 error_msg = "%s rdepends on %s" % (pkg,rdepend)
655 sane = package_qa_handle_error("debug-deps", error_msg, d) 642 sane = package_qa_handle_error("debug-deps", error_msg, d)
656 if (not "-dev" in pkg and not "-staticdev" in pkg) and rdepend.endswith("-dev") and "dev-deps" not in skip: 643 if (not "-dev" in pkg and not "-staticdev" in pkg) and rdepend.endswith("-dev") and "dev-deps" not in skip:
657 error_msg = "%s rdepends on %s" % (pkgname, rdepend) 644 error_msg = "%s rdepends on %s" % (pkg, rdepend)
658 sane = package_qa_handle_error("dev-deps", error_msg, d) 645 sane = package_qa_handle_error("dev-deps", error_msg, d)
659 646
660 return sane 647 return sane