From e257af489347851d0781b3882f711f580f245fbb Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Sun, 24 Sep 2017 08:51:20 +0800 Subject: lvm2: refactoring code to disable package config thin-provisioning-tools There are 2 GPL variations 'GPLv3' and 'GPLv3.0' for canonical (SPDX) form of 'GPL-3.0' now. Refactoring code to use function incompatible_license_contains() from license.bbclass to filter them all to disable package config 'thin-provisioning-tools'. Signed-off-by: Kai Kang Signed-off-by: Martin Jansa --- meta-oe/recipes-support/lvm2/lvm2.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-oe/recipes-support/lvm2') diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index d2c1474172..289e07d8df 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -19,12 +19,12 @@ SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ " S = "${WORKDIR}/LVM2.${PV}" -inherit autotools-brokensep pkgconfig systemd +inherit autotools-brokensep pkgconfig systemd license LVM2_PACKAGECONFIG = "dmeventd lvmetad" LVM2_PACKAGECONFIG_append_class-target = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ - ${@bb.utils.contains('INCOMPATIBLE_LICENSE', 'GPLv3', '', 'thin-provisioning-tools', d)} \ + ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ udev \ " -- cgit 1.2.3-korg