summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro
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 18:08:00 +0000
commitb3c625a7f2d745effc4102487ee48f8bab584644 (patch)
tree605d066d12b4b77f2dcc40d3f6c684d59e574cb8 /meta/conf/distro
parent5f78cf9b4ee56937298eaa55a6fddabae8dd8bd4 (diff)
downloadpoky-b3c625a7f2d745effc4102487ee48f8bab584644.tar.gz
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] (From OE-Core rev: fddca246f15ff72828a0198d8c4d3e58d8bf4442) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro')
-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"
12 12
13# Force db-native's version to keep sync with db while 13# Force db-native's version to keep sync with db while
14# 'AGPL-3.0' in ${INCOMPATIBLE_LICENSE} blacklist 14# 'AGPL-3.0' in ${INCOMPATIBLE_LICENSE} blacklist
15PREFERRED_VERSION_db-native = "${@base_contains('INCOMPATIBLE_LICENSE', 'AGPL-3.0', '5.%', '6.%', d)}" 15PREFERRED_VERSION_db-native = "${@incompatible_license_contains('AGPL-3.0', '5.%', '6.%', d)}"