[meta-oe][dunfell][PATCH] libdevmapper,lvm2: Do not inherit license

[meta-oe][dunfell][PATCH] libdevmapper,lvm2: Do not inherit license

[akash hadke]

From: Khem Raj <raj.khem@gmail.com>

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.

This commit is cherry-picked from upstream/master to
fix the below yocto-check-layer error.

bitbake-diffsigs --task libdevmapper do_configure --signature
f6a95f0cfe6789254c94484dcd7d895e3a83c7d8e80f7a45e80328ed3d58e981
87aa98db4256768cf62c48703d9a857b878e257aaa6ee463ea17e5004215d5de
NOTE: Starting bitbake server...
basehash changed from
f4b6194b76e01b7dcb9e87f36156a9077b65f56e08f4841ad57321faec03a54c
to ba9681d39513fd8ed22438ac25811535401a56d9ec23a8553978cf421c268b88

Variable AVAILABLE_LICENSES value changed.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: akash hadke <akash.hadke@kpit.com>
---
 meta-oe/recipes-support/lvm2/lvm2.inc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 01c9df4..2fe97d5 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 \
 SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02"
 S = "${WORKDIR}/git"
 
-inherit autotools-brokensep pkgconfig systemd license
+inherit autotools-brokensep pkgconfig systemd
 
 LVM2_PACKAGECONFIG = "dmeventd"
 LVM2_PACKAGECONFIG_append_class-target = " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
-    ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \
 "
 
 # odirect is always enabled because there currently is a bug in
@@ -37,6 +36,7 @@ PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd"
 PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct"
 PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
+# NOTE: Add thin-provisioning-tools only if your distro policy allows GPL-3.0 license
 PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools"
 
 # Unset user/group to unbreak install.
@@ -53,4 +53,3 @@ EXTRA_OECONF = "--with-user= \
                 --with-thin-repair=${sbindir}/thin_repair \
                 --with-thin-restore=${sbindir}/thin_restore \
 "
-
-- 
2.7.4

[meta-oe][dunfell][PATCH] libdevmapper,lvm2: Do not inherit license

[akash hadke]

From: Khem Raj <raj.khem@gmail.com>

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.

This commit is cherry-picked from upstream/master to
fix the below yocto-check-layer error.

bitbake-diffsigs --task libdevmapper do_configure --signature
f6a95f0cfe6789254c94484dcd7d895e3a83c7d8e80f7a45e80328ed3d58e981
87aa98db4256768cf62c48703d9a857b878e257aaa6ee463ea17e5004215d5de
NOTE: Starting bitbake server...
basehash changed from
f4b6194b76e01b7dcb9e87f36156a9077b65f56e08f4841ad57321faec03a54c
to ba9681d39513fd8ed22438ac25811535401a56d9ec23a8553978cf421c268b88

Variable AVAILABLE_LICENSES value changed.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: akash hadke <akash.hadke@kpit.com>
---
 meta-oe/recipes-support/lvm2/lvm2.inc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 01c9df4..2fe97d5 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 \
 SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02"
 S = "${WORKDIR}/git"
 
-inherit autotools-brokensep pkgconfig systemd license
+inherit autotools-brokensep pkgconfig systemd
 
 LVM2_PACKAGECONFIG = "dmeventd"
 LVM2_PACKAGECONFIG_append_class-target = " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
-    ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \
 "
 
 # odirect is always enabled because there currently is a bug in
@@ -37,6 +36,7 @@ PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd"
 PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct"
 PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
+# NOTE: Add thin-provisioning-tools only if your distro policy allows GPL-3.0 license
 PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools"
 
 # Unset user/group to unbreak install.
@@ -53,4 +53,3 @@ EXTRA_OECONF = "--with-user= \
                 --with-thin-repair=${sbindir}/thin_repair \
                 --with-thin-restore=${sbindir}/thin_restore \
 "
-
-- 
2.7.4