From: Ross Burton Date: Fri, 5 Jun 2015 16:46:58 +0000 (+0100) Subject: poky.conf: use correct GPLv3 license name X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c50daec0515b3463c905005507fff67abea58b34;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf index b47325da57c..e3d3c783c5d 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}"