Patchwork [13/16] insane.bbclass: Only depend on desktop-file-utils-native when we need it

login
register
mail settings
Submitter Richard Purdie
Date Feb. 23, 2012, 2:48 p.m.
Message ID <a272fb96eb48c2e1ae2756f98f9432d831a21057.1330004039.git.richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/21749/
State Accepted
Commit f775f76dc01f1a969c00f697507958d8a4f9b088
Headers show

Comments

Richard Purdie - Feb. 23, 2012, 2:48 p.m.
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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/insane.bbclass |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index ead6ec1..7a84465 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -23,7 +23,7 @@ 
 # The package.bbclass can help us here.
 #
 inherit package
-PACKAGE_DEPENDS += "pax-utils-native desktop-file-utils-native ${QADEPENDS}"
+PACKAGE_DEPENDS += "pax-utils-native ${QADEPENDS}"
 PACKAGEFUNCS += " do_package_qa "
 
 # unsafe-references-in-binaries requires prelink-rtld from
@@ -722,3 +722,9 @@  do_populate_sysroot[postfuncs] += "do_qa_staging "
 # have it in DEPENDS and for correct LIC_FILES_CHKSUM
 #addtask qa_configure after do_configure before do_compile
 do_configure[postfuncs] += "do_qa_configure "
+
+python () {
+    tests = d.getVar('WARN_QA', True) + " " + d.getVar('ERROR_QA', True)
+    if tests.find("desktop") != -1:
+        d.appendVar("PACKAGE_DEPENDS", "desktop-file-utils-native")
+}