[OE-core] [PATCH 2/3] default-versions.inc: let INCOMPATIBLE_LICENSE supports wildcard

Hongxu Jia hongxu.jia at windriver.com
Mon Dec 15 09:23:04 UTC 2014


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 at windriver.com>
---
 meta/conf/distro/include/default-versions.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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




More information about the Openembedded-core mailing list