diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-07-20 18:30:48 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2021-07-25 13:34:37 -0700 |
commit | 9bd8d14ef2b8ccdbf8a12a26325377d7695acdaf (patch) | |
tree | f20fd6c2c44cd3af7fd537219976033e2f7f0d5a | |
parent | da09c4c74344a339dfda670650381e6cf219bed7 (diff) | |
download | meta-openembedded-9bd8d14ef2b8ccdbf8a12a26325377d7695acdaf.tar.gz |
libdevmapper,lvm2: Do not inherit license
inheriting license class which brings in
AVAILABLE_LICENSES into do_configure task checksums class since it wants to
enable thin-provisioning-tools if distro allows GPL-3 automatically, but this
brings issues when other layers which have additional licenses are
provided which ends up in signature mismatches so leave that setting to end-user and keep it disabled by
default with a comment in recipes stating that if needed then the user should enable it via
config metadata or bbappends.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit f592e81f11d455546447ddff35b2f89e18c0cc0c)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 01c9df45c..2fe97d571 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
@@ -19,12 +19,11 @@ SRC_URI = "git://sourceware.org/git/lvm2.git \ | |||
19 | SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02" | 19 | SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02" |
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
21 | 21 | ||
22 | inherit autotools-brokensep pkgconfig systemd license | 22 | inherit autotools-brokensep pkgconfig systemd |
23 | 23 | ||
24 | LVM2_PACKAGECONFIG = "dmeventd" | 24 | LVM2_PACKAGECONFIG = "dmeventd" |
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 | ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ | ||
28 | " | 27 | " |
29 | 28 | ||
30 | # odirect is always enabled because there currently is a bug in | 29 | # odirect is always enabled because there currently is a bug in |
@@ -37,6 +36,7 @@ PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" | |||
37 | PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" | 36 | PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" |
38 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" | 37 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" |
39 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | 38 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" |
39 | # NOTE: Add thin-provisioning-tools only if your distro policy allows GPL-3.0 license | ||
40 | PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools" | 40 | PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools" |
41 | 41 | ||
42 | # Unset user/group to unbreak install. | 42 | # Unset user/group to unbreak install. |
@@ -53,4 +53,3 @@ EXTRA_OECONF = "--with-user= \ | |||
53 | --with-thin-repair=${sbindir}/thin_repair \ | 53 | --with-thin-repair=${sbindir}/thin_repair \ |
54 | --with-thin-restore=${sbindir}/thin_restore \ | 54 | --with-thin-restore=${sbindir}/thin_restore \ |
55 | " | 55 | " |
56 | |||