aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-12 18:00:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-13 00:09:00 +0000
commit7e36d13212763fe409747aba011c020c9aeba6d7 (patch)
treefa02ac31e1db728a6608dca5e987c9f13e2d0f58
parent2306683634435b990e63020fc5cf91753bbaf7b6 (diff)
downloadopenembedded-core-contrib-7e36d13212763fe409747aba011c020c9aeba6d7.tar.gz
openembedded-core-contrib-7e36d13212763fe409747aba011c020c9aeba6d7.tar.bz2
openembedded-core-contrib-7e36d13212763fe409747aba011c020c9aeba6d7.zip
insane/package: Fix cases where QA errors aren't fatal
When using package_qa_handle_error(), we need to check QA_SANE and give a fatal error if issues were raised. The main insane checks do this, the anonymous python in insane does not, nor does the code in package.bbclass. This was likely missed when the function was introduced to package.bbclass. The impact is that errors can be shown but don't stop the build (do_package succeeds), the initial build fails due to the errors shown but subsequent builds succeed. This is clearly broken. The solution is to check QA_SANE in places we use the handle_error function. [YOCTO #8907] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/insane.bbclass3
-rw-r--r--meta/classes/package.bbclass4
2 files changed, 7 insertions, 0 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index bf6a598484..ba9c6511fd 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1285,4 +1285,7 @@ python () {
d.setVarFlag('do_package_qa', 'rdeptask', '')
for i in issues:
package_qa_handle_error("pkgvarcheck", "%s: Variable %s is set as not being package specific, please fix this." % (d.getVar("FILE", True), i), d)
+ qa_sane = d.getVar("QA_SANE", True)
+ if not qa_sane:
+ bb.fatal("Fatal QA errors found, failing task.")
}
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 54f7ae55cf..fdcf5ff179 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -2052,6 +2052,10 @@ python do_package () {
for f in (d.getVar('PACKAGEFUNCS', True) or '').split():
bb.build.exec_func(f, d)
+
+ qa_sane = d.getVar("QA_SANE", True)
+ if not qa_sane:
+ bb.fatal("Fatal QA errors found, failing task.")
}
do_package[dirs] = "${SHLIBSWORKDIR} ${PKGDESTWORK} ${D}"