[oe-commits] Hongxu Jia : default-versions.inc: let INCOMPATIBLE_LICENSE supports wildcard

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: fddca246f15ff72828a0198d8c4d3e58d8bf4442
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=fddca246f15ff72828a0198d8c4d3e58d8bf4442

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Mon Dec 15 16:58:02 2014 +0800

default-versions.inc: let INCOMPATIBLE_LICENSE supports wildcard

While wildcard in INCOMPATIBLE_LICENSE, such as INCOMPATIBLE_LICENSE =
"*GPL-3", PREFERRED_VERSION_db-native could have the correct value "5.%"

[YOCTO #5592]

Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>

---

 meta/conf/distro/include/default-versions.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index 20e258b..6e92aa5 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -12,4 +12,4 @@ PREFERRED_VERSION_liberation-fonts ?= "1.04"
 
 # Force db-native's version to keep sync with db while
 # 'AGPL-3.0' in ${INCOMPATIBLE_LICENSE} blacklist
-PREFERRED_VERSION_db-native = "${@base_contains('INCOMPATIBLE_LICENSE', 'AGPL-3.0', '5.%', '6.%', d)}"
+PREFERRED_VERSION_db-native = "${@incompatible_license_contains('AGPL-3.0', '5.%', '6.%', d)}"