From: Hongxu Jia Date: Mon, 15 Dec 2014 09:03:28 +0000 (+0800) Subject: libproxy: let INCOMPATIBLE_LICENSE supports wildcard X-Git-Tag: 2015-4~1016 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=97f46c97c7f8a39f3691aee423b4192680d114a0;p=openembedded-core.git libproxy: let INCOMPATIBLE_LICENSE supports wildcard While wildcard in INCOMPATIBLE_LICENSE, such as INCOMPATIBLE_LICENSE = "*GPL-3", libproxy could correct work. [YOCTO #5592] Signed-off-by: Hongxu Jia --- diff --git a/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/meta/recipes-support/libproxy/libproxy_0.4.11.bb index a53a197615..3367c85156 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.11.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.11.bb @@ -29,7 +29,7 @@ do_configure_prepend() { } python() { - if bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "x", "", d) == "x" or bb.utils.contains("DISTRO_FEATURES", "x11", "x", "", d) == "": + if incompatible_license_contains("GPLv3", "x", "", d) == "x" or bb.utils.contains("DISTRO_FEATURES", "x11", "x", "", d) == "": d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE").replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no")) d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS").split() if i != "gconf")) }