]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
poky.conf: use correct GPLv3 license name
authorRoss Burton <ross.burton@intel.com>
Fri, 5 Jun 2015 16:46:58 +0000 (17:46 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 8 Jun 2015 16:34:06 +0000 (17:34 +0100)
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>
meta-yocto/conf/distro/poky.conf

index b47325da57c6150251f08a4e30eb967b93cd4ade..e3d3c783c5d5e4cc94ff2783db61e8937e6f002d 100644 (file)
@@ -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}"