summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-05-26 09:23:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-01 17:48:13 +0100
commit54825128e13cc1b601585daefa84e1dcdd6dc995 (patch)
tree8f16e306f5b7b268886c0a49fe1141ae0aad259c /meta-yocto/conf
parent802080eb6dd4c872ef16797f06d1aee43624a64c (diff)
downloadpoky-54825128e13cc1b601585daefa84e1dcdd6dc995.tar.gz
poky.conf: Make qemu-config optional for non-GPLv3
[YOCTO #1033] Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta-yocto/conf')
-rw-r--r--meta-yocto/conf/distro/poky.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 2a5ffb6172..67242298f5 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -18,7 +18,7 @@ EXTRAOPKGCONFIG = "poky-feed-config-opkg"
18DISTRO_EXTRA_RDEPENDS += "task-core-boot" 18DISTRO_EXTRA_RDEPENDS += "task-core-boot"
19DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet" 19DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
20 20
21POKYQEMUDEPS = "qemu-config" 21POKYQEMUDEPS = "${@base_contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "qemu-config",d)}"
22DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" 22DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}"
23DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}" 23DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}"
24DISTRO_EXTRA_RDEPENDS_append_qemuppc = " ${POKYQEMUDEPS}" 24DISTRO_EXTRA_RDEPENDS_append_qemuppc = " ${POKYQEMUDEPS}"