From 0bfb2094e3eadc85358a354d12b211ff69612a61 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 1 Oct 2012 14:13:37 +0100 Subject: 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 --- meta/classes/insane.bbclass | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'meta') 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): sane = True if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg: - # Copied from package_ipk.bbclass - # boiler plate to update the data localdata = bb.data.createCopy(d) - root = "%s/%s" % (pkgdest, pkg) - - localdata.setVar('ROOT', '') - localdata.setVar('ROOT_%s' % pkg, root) - pkgname = localdata.getVar('PKG_%s' % pkg, True) - if not pkgname: - pkgname = pkg - localdata.setVar('PKG', pkgname) - localdata.setVar('OVERRIDES', pkg) - bb.data.update_data(localdata) # Now check the RDEPENDS rdepends = bb.utils.explode_deps(localdata.getVar('RDEPENDS', True) or "") - # Now do the sanity check!!! for rdepend in rdepends: if "-dbg" in rdepend and "debug-deps" not in skip: - error_msg = "%s rdepends on %s" % (pkgname,rdepend) + error_msg = "%s rdepends on %s" % (pkg,rdepend) sane = package_qa_handle_error("debug-deps", error_msg, d) if (not "-dev" in pkg and not "-staticdev" in pkg) and rdepend.endswith("-dev") and "dev-deps" not in skip: - error_msg = "%s rdepends on %s" % (pkgname, rdepend) + error_msg = "%s rdepends on %s" % (pkg, rdepend) sane = package_qa_handle_error("dev-deps", error_msg, d) return sane -- cgit v1.2.3-54-g00ecf