diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-04-22 18:03:43 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-04-26 08:24:04 -0700 |
commit | f592e81f11d455546447ddff35b2f89e18c0cc0c (patch) | |
tree | 5a707957b59c53b53dbe984285a9d8fcbcfd0ef8 /meta-oe/recipes-support/lvm2 | |
parent | 30ca058a1e45cf924e204e816f7c2f9b691ed74f (diff) | |
download | meta-openembedded-f592e81f11d455546447ddff35b2f89e18c0cc0c.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>
Diffstat (limited to 'meta-oe/recipes-support/lvm2')
-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 6618e21f3b..ccb4f7ac14 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
@@ -21,12 +21,11 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ | |||
21 | SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6" | 21 | SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6" |
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | 23 | ||
24 | inherit autotools-brokensep pkgconfig systemd license | 24 | inherit autotools-brokensep pkgconfig systemd |
25 | 25 | ||
26 | LVM2_PACKAGECONFIG = "dmeventd" | 26 | LVM2_PACKAGECONFIG = "dmeventd" |
27 | LVM2_PACKAGECONFIG_append_class-target = " \ | 27 | LVM2_PACKAGECONFIG_append_class-target = " \ |
28 | ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ | 28 | ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ |
29 | ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ | ||
30 | " | 29 | " |
31 | 30 | ||
32 | # odirect is always enabled because there currently is a bug in | 31 | # odirect is always enabled because there currently is a bug in |
@@ -39,6 +38,7 @@ PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" | |||
39 | PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" | 38 | PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" |
40 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" | 39 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" |
41 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | 40 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" |
41 | # NOTE: Add thin-provisioning-tools only if your distro policy allows GPL-3.0 license | ||
42 | PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools" | 42 | PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools" |
43 | 43 | ||
44 | # Unset user/group to unbreak install. | 44 | # Unset user/group to unbreak install. |
@@ -55,4 +55,3 @@ EXTRA_OECONF = "--with-user= \ | |||
55 | --with-thin-repair=${sbindir}/thin_repair \ | 55 | --with-thin-repair=${sbindir}/thin_repair \ |
56 | --with-thin-restore=${sbindir}/thin_restore \ | 56 | --with-thin-restore=${sbindir}/thin_restore \ |
57 | " | 57 | " |
58 | |||