diff options
author | Kai Kang <kai.kang@windriver.com> | 2017-09-24 08:51:20 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-10-04 14:51:45 +0000 |
commit | e257af489347851d0781b3882f711f580f245fbb (patch) | |
tree | ee4b62c8d3d5d6b4196e710247a85e95659cd1d2 | |
parent | 06e8aa6bda49b4c103dcb41b059e3dba168ee37a (diff) | |
download | meta-openembedded-e257af489347851d0781b3882f711f580f245fbb.tar.gz |
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 <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index d2c147417..289e07d8d 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 \ | |||
19 | " | 19 | " |
20 | S = "${WORKDIR}/LVM2.${PV}" | 20 | S = "${WORKDIR}/LVM2.${PV}" |
21 | 21 | ||
22 | inherit autotools-brokensep pkgconfig systemd | 22 | inherit autotools-brokensep pkgconfig systemd license |
23 | 23 | ||
24 | LVM2_PACKAGECONFIG = "dmeventd lvmetad" | 24 | LVM2_PACKAGECONFIG = "dmeventd lvmetad" |
25 | LVM2_PACKAGECONFIG_append_class-target = " \ | 25 | LVM2_PACKAGECONFIG_append_class-target = " \ |
26 | ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ | 26 | ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ |
27 | ${@bb.utils.contains('INCOMPATIBLE_LICENSE', 'GPLv3', '', 'thin-provisioning-tools', d)} \ | 27 | ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ |
28 | udev \ | 28 | udev \ |
29 | " | 29 | " |
30 | 30 | ||