summaryrefslogtreecommitdiff
path: root/meta/conf
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-12-15 16:58:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-19 17:54:14 +0000
commitfddca246f15ff72828a0198d8c4d3e58d8bf4442 (patch)
treeb1b106a740d8f7c9758e21da5c126c123f83f2db /meta/conf
parent3587653a8d8abc7cfed6a5c6ecfa72bee283e451 (diff)
downloadopenembedded-core-fddca246f15ff72828a0198d8c4d3e58d8bf4442.tar.gz
openembedded-core-fddca246f15ff72828a0198d8c4d3e58d8bf4442.tar.bz2
openembedded-core-fddca246f15ff72828a0198d8c4d3e58d8bf4442.zip
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>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/default-versions.inc2
1 files changed, 1 insertions, 1 deletions
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)}"