diff options
Diffstat (limited to 'classes/insane.bbclass')
| -rw-r--r-- | classes/insane.bbclass | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 950bb9771e..495c3a53aa 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -181,7 +181,6 @@ def package_qa_get_elf(path, bits32): def package_qa_clean_path(path,d): """ Remove the common prefix from the path. In this case it is the TMPDIR""" - import bb return path.replace(bb.data.getVar('TMPDIR',d,True),"") def package_qa_make_fatal_error(error_class, name, path,d): @@ -196,7 +195,6 @@ def package_qa_write_error(error_class, name, path, d): """ Log the error """ - import bb, os if not bb.data.getVar('QA_LOG', d): bb.note("a QA error occured but will not be logged because QA_LOG is not set") return @@ -221,7 +219,6 @@ def package_qa_write_error(error_class, name, path, d): f.close() def package_qa_handle_error(error_class, error_msg, name, path, d): - import bb bb.error("QA Issue with %s: %s" % (name, error_msg)) package_qa_write_error(error_class, name, path, d) return not package_qa_make_fatal_error(error_class, name, path, d) @@ -258,7 +255,6 @@ def package_qa_check_dev(path, name,d, elf): Check for ".so" library symlinks in non-dev packages """ - import bb, os sane = True # SDK packages are special. @@ -279,7 +275,6 @@ def package_qa_check_dbg(path, name,d, elf): Check for ".debug" files or directories outside of the dbg package """ - import bb, os sane = True if not "-dbg" in name: @@ -304,7 +299,6 @@ def package_qa_check_arch(path,name,d, elf): if not elf: return True - import bb, os sane = True target_os = bb.data.getVar('TARGET_OS', d, True) target_arch = bb.data.getVar('TARGET_ARCH', d, True) @@ -339,7 +333,6 @@ def package_qa_check_desktop(path, name, d, elf): """ Run all desktop files through desktop-file-validate. """ - import bb, os sane = True if path.endswith(".desktop"): output = os.popen("desktop-file-validate %s" % path) @@ -353,7 +346,6 @@ def package_qa_hash_style(path, name, d, elf): """ Check if the binary has the right hash style... """ - import bb, os if not elf: return True @@ -400,7 +392,6 @@ def package_qa_check_staged(path,d): to find the one responsible for the errors easily even if we look at every .pc and .la file """ - import os, bb sane = True tmpdir = bb.data.getVar('TMPDIR', d, True) @@ -440,7 +431,6 @@ def package_qa_check_staged(path,d): # Walk over all files in a directory and call func def package_qa_walk(path, funcs, package,d): - import bb, os sane = True #if this will throw an exception, then fix the dict above @@ -463,14 +453,13 @@ def package_qa_walk(path, funcs, package,d): return sane -def package_qa_check_rdepends(pkg, workdir, d): - import bb +def package_qa_check_rdepends(pkg, pkgdest, d): sane = True 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) + root = "%s/%s" % (pkgdest, pkg) bb.data.setVar('ROOT', '', localdata) bb.data.setVar('ROOT_%s' % pkg, root, localdata) @@ -501,9 +490,8 @@ def package_qa_check_rdepends(pkg, workdir, d): # The PACKAGE FUNC to scan each package python do_package_qa () { - import bb bb.debug(2, "DO PACKAGE QA") - workdir = bb.data.getVar('WORKDIR', d, True) + pkgdest = bb.data.getVar('PKGDEST', d, True) packages = bb.data.getVar('PACKAGES',d, True) # no packages should be scanned @@ -522,10 +510,10 @@ python do_package_qa () { continue bb.debug(1, "Checking Package: %s" % package) - path = "%s/install/%s" % (workdir, package) + path = "%s/%s" % (pkgdest, package) if not package_qa_walk(path, checks, package, d): walk_sane = False - if not package_qa_check_rdepends(package, workdir, d): + if not package_qa_check_rdepends(package, pkgdest, d): rdepends_sane = False if not walk_sane or not rdepends_sane: @@ -547,7 +535,6 @@ python do_qa_staging() { addtask qa_configure after do_configure before do_compile python do_qa_configure() { bb.debug(1, "Checking sanity of the config.log file") - import os for root, dirs, files in os.walk(bb.data.getVar('WORKDIR', d, True)): statement = "grep 'CROSS COMPILE Badness:' %s > /dev/null" % \ os.path.join(root,"config.log") |