diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2013-05-12 06:46:10 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-07 16:48:26 +0100 |
commit | 43713b9e17707992569d807cdd61aaaf969ec6fc (patch) | |
tree | cb9bb614ac90762280db1560c3ad21eff4069f16 /meta/classes/package.bbclass | |
parent | 7a5a7551eb3ea1d4485e697f60e94cab4ed40946 (diff) | |
download | poky-43713b9e17707992569d807cdd61aaaf969ec6fc.tar.gz |
insane/package: let package.bbclass inherit insane.bbclass
RP's comment:
"What we're trying to do is move everything to use a standard mechanism
for reporting issues of this type (do_package). With insane.bbclass, you
can elect whether a given type of error is a warning or error and fails
the task."
* The package.bbclass had used package_qa_handle_error() which is from
insane.bbclass, and we will use it for handling other warnings and
errors, so let package.bbclass inherit insane.bbclass, this change will
make the insane as a requirement (always included).
* Change the "PACKAGEFUNCS ?=" to "+=", otherwise there would be an
error like:
Exception: variable SUMMARY references itself!
This is because we let package.bbclass inherit insane.bbclass, and
PACKAGEFUNCS has been set in insane.bbclass, so the "PACKAGEFUNCS ?="
will set nothing, then the "emit_pkgdata" doesn't run which will
cause this error.
* Add a QA_SANE variable in insane.bbclass, once the error type
is ERROR_QA, it will fail the task and stop the build.
[YOCTO #3190]
[YOCTO #4396]
(From OE-Core rev: 852dead71387c66ec0cba7c71e3814a74e409560)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r-- | meta/classes/package.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 02a1460624..f72c0e23b4 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -42,6 +42,9 @@ inherit packagedata | |||
42 | inherit prserv | 42 | inherit prserv |
43 | inherit chrpath | 43 | inherit chrpath |
44 | 44 | ||
45 | # Need the package_qa_handle_error() in insane.bbclass | ||
46 | inherit insane | ||
47 | |||
45 | PKGD = "${WORKDIR}/package" | 48 | PKGD = "${WORKDIR}/package" |
46 | PKGDEST = "${WORKDIR}/packages-split" | 49 | PKGDEST = "${WORKDIR}/packages-split" |
47 | 50 | ||
@@ -1813,7 +1816,7 @@ PACKAGESPLITFUNCS ?= " \ | |||
1813 | package_do_split_locales \ | 1816 | package_do_split_locales \ |
1814 | populate_packages" | 1817 | populate_packages" |
1815 | # Functions which process metadata based on split packages | 1818 | # Functions which process metadata based on split packages |
1816 | PACKAGEFUNCS ?= " \ | 1819 | PACKAGEFUNCS += " \ |
1817 | package_fixsymlinks \ | 1820 | package_fixsymlinks \ |
1818 | package_name_hook \ | 1821 | package_name_hook \ |
1819 | package_do_filedeps \ | 1822 | package_do_filedeps \ |