diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-01 14:13:37 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 11:35:11 +0100 |
| commit | 48aa4b00cfb7f01195c6d20b7ba660715fe792ef (patch) | |
| tree | f5a11ff996fdeef883d3b6273990124150f9f420 /meta | |
| parent | bf334f01cb90483ba304b4a830d53e705637b87a (diff) | |
| download | openembedded-core-48aa4b00cfb7f01195c6d20b7ba660715fe792ef.tar.gz openembedded-core-48aa4b00cfb7f01195c6d20b7ba660715fe792ef.tar.bz2 openembedded-core-48aa4b00cfb7f01195c6d20b7ba660715fe792ef.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/insane.bbclass | 17 |
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): 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 |