From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 15 Dec 2014 08:58:02 +0000 (+0800)
Subject: default-versions.inc: let INCOMPATIBLE_LICENSE supports wildcard
X-Git-Tag: 2015-4~1017
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=fddca246f15ff72828a0198d8c4d3e58d8bf4442;p=openembedded-core.git

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@windriver.com>
---

diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index 20e258be49..6e92aa5499 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)}"