diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2006-10-26 13:02:54 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2006-10-26 13:02:54 +0000 |
commit | 85c7d84780764f9d6a063a07435734b854c2132d (patch) | |
tree | 4d40828673469fc3b5d01b156d230456ee90e307 /classes | |
parent | e8b53dabb69255ec4772b07b2c5ea92d3addd1ed (diff) | |
parent | 484d308e167d41e5b28e81ccbdcfc59932139696 (diff) |
merge of '1d92511895390061fd3632d482db7306357d2698'
and '1db4aa570f4ea8df95e32e241f2b2e7e6f87ab3f'
Diffstat (limited to 'classes')
-rw-r--r-- | classes/insane.bbclass | 12 | ||||
-rw-r--r-- | classes/test.bbclass | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 062b1505b1..75602d0f44 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -17,6 +17,7 @@ # possible and this is contained within the pax-utils-native # + # We play a special package function inherit package PACKAGE_DEPENDS += "pax-utils-native" @@ -90,26 +91,27 @@ def package_qa_walk(path, funcs, package,d): func(path, package,d) -def package_qa_check_rdepends(pkg, d): +def package_qa_check_rdepends(pkg, workdir, d): + import bb if not "-dbg" in pkg and not "task-" 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/install/%s" % (workdir, pkg) - + bb.data.setVar('ROOT', '', localdata) bb.data.setVar('ROOT_%s' % pkg, root, localdata) pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, 1) if not pkgname: pkgname = pkg bb.data.setVar('PKG', pkgname, localdata) - + overrides = bb.data.getVar('OVERRIDES', localdata) if not overrides: raise bb.build.FuncFailed('OVERRIDES not defined') overrides = bb.data.expand(overrides, localdata) bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) - + bb.data.update_data(localdata) # Now check the RDEPENDS @@ -135,7 +137,7 @@ python do_package_qa () { bb.note("Package: %s" % package) path = "%s/install/%s" % (workdir, package) package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch], package, d) - package_qa_check_rdepends(package, d) + package_qa_check_rdepends(package, workdir, d) } diff --git a/classes/test.bbclass b/classes/test.bbclass index 71afe88404..ff3e945395 100644 --- a/classes/test.bbclass +++ b/classes/test.bbclass @@ -7,7 +7,7 @@ # -addtask test after do_compile +addtask test after do_compile before do_build test_do_test () { : } |