summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-06-05 17:46:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-08 17:34:06 +0100
commitc93f33414004d6e6f2040c226ac3488d5f8c6125 (patch)
treecd7bde334922616e2943f50a45f276b2df68a72a /meta-yocto/conf
parent90b58da749b43bf4a2f2882244e99948da6af31b (diff)
downloadpoky-c93f33414004d6e6f2040c226ac3488d5f8c6125.tar.gz
poky.conf: use correct GPLv3 license name
The logic to determine whether qemu images can ship parts of the toolchain was using the old (non-canonical) name for GPL v3, which meant qemu images were attempting to install binutils in no-v3 images. Fix this by using the canonical license name in the check. (From meta-yocto rev: c50daec0515b3463c905005507fff67abea58b34) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 b47325da57..e3d3c783c5 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -32,7 +32,7 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
32DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" 32DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
33DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}" 33DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
34 34
35POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "packagegroup-core-device-devel",d)}" 35POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPL-3.0", "", "packagegroup-core-device-devel",d)}"
36DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" 36DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}"
37DISTRO_EXTRA_RDEPENDS_append_qemuarm64 = " ${POKYQEMUDEPS}" 37DISTRO_EXTRA_RDEPENDS_append_qemuarm64 = " ${POKYQEMUDEPS}"
38DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}" 38DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}"