From b3c625a7f2d745effc4102487ee48f8bab584644 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 15 Dec 2014 16:58:02 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/conf/distro/include/default-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/conf/distro/include') 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)}" -- cgit v1.2.3-54-g00ecf