From c93f33414004d6e6f2040c226ac3488d5f8c6125 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 5 Jun 2015 17:46:58 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta-yocto/conf/distro/poky.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-yocto') 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}" DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}" -POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "packagegroup-core-device-devel",d)}" +POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPL-3.0", "", "packagegroup-core-device-devel",d)}" DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" DISTRO_EXTRA_RDEPENDS_append_qemuarm64 = " ${POKYQEMUDEPS}" DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}" -- cgit v1.2.3-54-g00ecf