diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-23 12:40:36 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-24 00:12:02 +0000 |
commit | 6ad11cba63e3dae8a3eedd1fadc62f210c6488cb (patch) | |
tree | 236115833b6199c3ab4b570a13340133eb4b3d27 | |
parent | 2fb9aace07c7551dd11e0727dcf202deb39ded01 (diff) | |
download | poky-6ad11cba63e3dae8a3eedd1fadc62f210c6488cb.tar.gz |
insane.bbclass: Only depend on desktop-file-utils-native when we need it
There is no point in depending on desktop-file-utils if we're not going to
use it. This patch makes the dependency conditional upon the desktop tests
being enabled.
(From OE-Core rev: f775f76dc01f1a969c00f697507958d8a4f9b088)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/insane.bbclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index ead6ec1a86..7a84465ca6 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -23,7 +23,7 @@ | |||
23 | # The package.bbclass can help us here. | 23 | # The package.bbclass can help us here. |
24 | # | 24 | # |
25 | inherit package | 25 | inherit package |
26 | PACKAGE_DEPENDS += "pax-utils-native desktop-file-utils-native ${QADEPENDS}" | 26 | PACKAGE_DEPENDS += "pax-utils-native ${QADEPENDS}" |
27 | PACKAGEFUNCS += " do_package_qa " | 27 | PACKAGEFUNCS += " do_package_qa " |
28 | 28 | ||
29 | # unsafe-references-in-binaries requires prelink-rtld from | 29 | # unsafe-references-in-binaries requires prelink-rtld from |
@@ -722,3 +722,9 @@ do_populate_sysroot[postfuncs] += "do_qa_staging " | |||
722 | # have it in DEPENDS and for correct LIC_FILES_CHKSUM | 722 | # have it in DEPENDS and for correct LIC_FILES_CHKSUM |
723 | #addtask qa_configure after do_configure before do_compile | 723 | #addtask qa_configure after do_configure before do_compile |
724 | do_configure[postfuncs] += "do_qa_configure " | 724 | do_configure[postfuncs] += "do_qa_configure " |
725 | |||
726 | python () { | ||
727 | tests = d.getVar('WARN_QA', True) + " " + d.getVar('ERROR_QA', True) | ||
728 | if tests.find("desktop") != -1: | ||
729 | d.appendVar("PACKAGE_DEPENDS", "desktop-file-utils-native") | ||
730 | } | ||