[oe-commits] org.oe.dev classes/insane.bbclass: Print the actual error, write a log file
freyther commit
openembedded-commits at lists.openembedded.org
Sun Feb 18 17:22:56 UTC 2007
classes/insane.bbclass: Print the actual error, write a log file
-Print all errors of the built packages and if we have printed
any errors fail
-Log the errors to a log file, so we can see them afterwards
-Print the path (- the TMPDIR) of the package in question
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: c416a7368aa98390e48b2c8eed6650147874a490
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c416a7368aa98390e48b2c8eed6650147874a490
Files:
1
classes/insane.bbclass
Diffs:
#
# mt diff -ra8bf0677a23a474e197151ebb4c24ddbf5c65a67 -rc416a7368aa98390e48b2c8eed6650147874a490
#
#
#
# patch "classes/insane.bbclass"
# from [2dd57d99648c8825834fb05fd2c34ae4499885b4]
# to [f7d251426de3818874bf704becdc57844b015456]
#
============================================================
--- classes/insane.bbclass 2dd57d99648c8825834fb05fd2c34ae4499885b4
+++ classes/insane.bbclass f7d251426de3818874bf704becdc57844b015456
@@ -24,6 +24,28 @@ PACKAGEFUNCS += " do_package_qa "
PACKAGE_DEPENDS += "pax-utils-native"
PACKAGEFUNCS += " do_package_qa "
+def package_qa_clean_path(path,d):
+ import bb
+ return path.replace(bb.data.getVar('TMPDIR',d,True),"")
+
+def package_qa_write_error(error_class, name, path, d):
+ import bb, os
+ if not bb.data.getVar('QA_LOG', d):
+ return
+
+ ERROR_NAMES =[
+ "dev/dbg contains .so",
+ "package contains RPATH",
+ "package depends on debug package",
+ ]
+
+
+ log_path = os.path.join( bb.data.getVar('T', d, True), "log.qa_package" )
+ f = file( log_path, "a+")
+ print >> f, "%s, %s, %s" % (ERROR_NAMES[error_class], name, package_qa_clean_path(path,d))
+ f.close()
+
+
def package_qa_check_rpath(file,name,d):
"""
Check for dangerous RPATHs
@@ -32,16 +54,18 @@ def package_qa_check_rpath(file,name,d):
scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'scanelf')
bad_dir = bb.data.getVar('TMPDIR', d, True) + "/work"
if not os.path.exists(scanelf):
- bb.note("Can not check RPATH scanelf not found")
+ bb.fatal("Can not check RPATH scanelf not found")
if not bad_dir in bb.data.getVar('WORKDIR', d, True):
bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check")
output = os.popen("%s -Byr %s" % (scanelf,file))
txt = output.readline().rsplit()
if bad_dir in txt:
- bb.fatal("QA Issue package %s contains bad RPATH %s in file %s" % (name, txt, file))
+ package_qa_write_error( 1, name, file, d)
+ bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, txt, file))
+ return False
- pass
+ return True
def package_qa_check_devdbg(path, name,d):
"""
@@ -50,50 +74,69 @@ def package_qa_check_devdbg(path, name,d
"""
import bb
+ sane = True
+
if not "-dev" in name:
if path[-3:] == ".so":
- bb.fatal("QA Issue: non dev package contains .so: %s" % name)
+ package_qa_write_error( 0, name, path, d )
+ bb.error("QA Issue: non dev package contains .so: %s path '%s'" % (name, package_qa_clean_path(path,d)))
+ sane = False
if not "-dbg" in name:
if '.debug' in path:
- bb.fatal("QA Issue: non debug package contains .debug directory: %s" % name)
+ package_qa_write_error( 0, name, path, d )
+ bb.error("QA Issue: non debug package contains .debug directory: %s path %s" % (name, package_qa_clean_path(path,d)))
+ sane = False
+ return sane
+
def package_qa_check_perm(path,name,d):
"""
Check the permission of files
"""
- pass
+ sane = True
+ return sane
def package_qa_check_arch(path,name,d):
"""
Check if archs are compatible
"""
- pass
+ sane = True
+ return sane
def package_qa_check_pcla(path,name,d):
"""
- .pc and .la files should not point
+ .pc and .la files should not point to the WORKDIR
"""
+ sane = True
+ return sane
def package_qa_check_staged(path,d):
"""
Check staged la and pc files for sanity
-e.g. installed being false
"""
- pass
+ sane = True
+ return sane
# Walk over all files in a directory and call func
def package_qa_walk(path, funcs, package,d):
import os
+ sane = True
+
for root, dirs, files in os.walk(path):
for file in files:
path = os.path.join(root,file)
for func in funcs:
- func(path, package,d)
+ if not func(path, package,d):
+ sane = False
+ return sane
+
def package_qa_check_rdepends(pkg, workdir, d):
- import bb
+ import bb
+ 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
@@ -122,8 +165,12 @@ def package_qa_check_rdepends(pkg, workd
# Now do the sanity check!!!
for rdepend in rdepends:
if "-dbg" in rdepend:
- bb.fatal("QA issue, koen give us a better msg!!!")
+ package_qa_write_error( 2, name, rdepend, d )
+ bb.error("QA issue, koen give us a better msg!!!")
+ sane = False
+ return sane
+
# The PACKAGE FUNC to scan each package
python do_package_qa () {
bb.note("DO PACKAGE QA")
@@ -134,12 +181,19 @@ python do_package_qa () {
if not packages:
return
+ walk_sane = True
+ rdepends_sane = True
for package in packages.split():
- bb.note("Package: %s" % package)
+ bb.note("Checking 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, workdir, d)
+ if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch], package, d):
+ walk_sane = False
+ if not package_qa_check_rdepends(package, workdir, d):
+ rdepends_sane = False
+ if not walk_sane or not rdepends_sane:
+ bb.fatal("QA ran found fatal errors. Please consider fixing them")
+ bb.note("DONE with PACKAGE QA")
}
@@ -156,8 +210,8 @@ python do_qa_configure() {
python do_qa_configure() {
bb.note("Checking sanity of the config.log file")
import os
- for root, dirs, files in os.walk(bb.data.getVar('S', d, True)):
+ for root, dirs, files in os.walk(bb.data.getVar('WORKDIR', d, True)):
if "config.log" in files:
if os.system("grep 'CROSS COMPILE Badness:' %s > /dev/null" % (os.path.join(root,"config.log"))) == 0:
- bb.fatal("This autoconf log indicates errors, it looked at host includes")
+ bb.fatal("This autoconf log indicates errors, it looked at host includes. Rerun configure task after fixing this. Path was '%s'", root)
}
More information about the Openembedded-commits
mailing list