diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-12-15 17:03:28 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-19 18:08:00 +0000 |
commit | 0932d84f265446fae5bdb587529f8510742e0c70 (patch) | |
tree | 6bc076f8df3386fc2c3b5b6f53d78282e5eb2d79 /meta/recipes-support | |
parent | b3c625a7f2d745effc4102487ee48f8bab584644 (diff) | |
download | poky-0932d84f265446fae5bdb587529f8510742e0c70.tar.gz |
libproxy: let INCOMPATIBLE_LICENSE supports wildcard
While wildcard in INCOMPATIBLE_LICENSE, such as INCOMPATIBLE_LICENSE =
"*GPL-3", libproxy could correct work.
[YOCTO #5592]
(From OE-Core rev: 97f46c97c7f8a39f3691aee423b4192680d114a0)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/libproxy/libproxy_0.4.11.bb | 2 |
1 files changed, 1 insertions, 1 deletions
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() { | |||
29 | } | 29 | } |
30 | 30 | ||
31 | python() { | 31 | python() { |
32 | if bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "x", "", d) == "x" or bb.utils.contains("DISTRO_FEATURES", "x11", "x", "", d) == "": | 32 | if incompatible_license_contains("GPLv3", "x", "", d) == "x" or bb.utils.contains("DISTRO_FEATURES", "x11", "x", "", d) == "": |
33 | d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE").replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no")) | 33 | d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE").replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no")) |
34 | d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS").split() if i != "gconf")) | 34 | d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS").split() if i != "gconf")) |
35 | } | 35 | } |