]> code.ossystems Code Review - openembedded-core.git/commitdiff
default-versions.inc: let INCOMPATIBLE_LICENSE supports wildcard
authorHongxu Jia <hongxu.jia@windriver.com>
Mon, 15 Dec 2014 08:58:02 +0000 (16:58 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 19 Dec 2014 17:54:14 +0000 (17:54 +0000)
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>
meta/conf/distro/include/default-versions.inc

index 20e258be4953086e785c503970472f1f163e88a2..6e92aa54999fa961a24c011cd8ac128a8a8c38e5 100644 (file)
@@ -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)}"