[PATCH 1/3] packagegroup-base: only pull in dosfstools if licensing allows

[PATCH 1/3] packagegroup-base: only pull in dosfstools if licensing allows

[Ross Burton]

packagegroup-base-vfat RRECOMMENDS on dosfstools, but this is GPLv3 so
may be blacklisted.  Respect INCOMPATIBLE_LICENSE and don't recommend if
GPL-3.0 has been blacklisted.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-core/packagegroups/packagegroup-base.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index 1f802da09b7..3476db09c35 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -168,7 +168,7 @@ RRECOMMENDS_packagegroup-base-vfat = "\
     kernel-module-vfat \
     kernel-module-nls-iso8859-1 \
     kernel-module-nls-cp437 \
-    dosfstools"
+    ${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPL-3.0", "", "dosfstools", d)}"
 
 SUMMARY_packagegroup-base-alsa = "ALSA sound support"
 RDEPENDS_packagegroup-base-alsa = "\
-- 
2.20.1

[PATCH 2/3] connman: add PACKAGECONFIG for the commandline client

[Ross Burton]

The client depends on readline which is GPLv3.  Add a PACKAGECONFIG so users who
don't need the client and are against GPLv3 can disable it.

Also remove the explicit installation of the client in do_install_append, as the
Makefile installs it now.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-connectivity/connman/connman.inc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index ff3aff5f1ff..d3eeb3be1c2 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
 
 inherit autotools pkgconfig systemd update-rc.d update-alternatives
 
-DEPENDS  = "dbus glib-2.0 ppp readline"
+DEPENDS  = "dbus glib-2.0 ppp"
 
 INC_PR = "r20"
 
@@ -27,13 +27,11 @@ EXTRA_OECONF += "\
     --enable-ethernet \
     --enable-tools \
     --disable-polkit \
-    --enable-client \
 "
 
-PACKAGECONFIG ??= "wispr \
+PACKAGECONFIG ??= "wispr iptables client\
                    ${@bb.utils.filter('DISTRO_FEATURES', '3g systemd wifi', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
-                   iptables \
 "
 
 # If you want ConnMan to support VPN, add following statement into
@@ -54,6 +52,7 @@ PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls,"
 PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl libnftnl,,kernel-module-nf-tables kernel-module-nft-chain-nat-ipv4 kernel-module-nft-chain-route-ipv4 kernel-module-nft-masq-ipv4 kernel-module-nft-nat"
 PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables"
 PACKAGECONFIG[nfc] = "--enable-neard, --disable-neard, neard, neard"
+PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
 
 INITSCRIPT_NAME = "connman"
 INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
@@ -87,7 +86,6 @@ do_install_append() {
 	if [ -e ${B}/tools/wispr ]; then
 		install -m 0755 ${B}/tools/wispr ${D}${bindir}
 	fi
-	install -m 0755 ${B}/client/connmanctl ${D}${bindir}
 
 	# We don't need to package an empty directory
 	rmdir --ignore-fail-on-non-empty ${D}${libdir}/connman/scripts
-- 
2.20.1

[PATCH 3/3] shared-mime-info: actually depends on itstool-native

[Ross Burton]

shared-mime-info needs itstool-native, not itstool.  Fixing this removes itstool
from the rdepends of shared-mime-info-dev.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-support/shared-mime-info/shared-mime-info_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
index b2d562157b7..f0d5bc62e9e 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
@@ -5,7 +5,7 @@ SECTION = "base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-DEPENDS = "libxml2 itstool glib-2.0 shared-mime-info-native"
+DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native"
 
 SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https"
 SRCREV = "829b26d85e7d89a0caee03046c3bce373f04c80a"
-- 
2.20.1

Re: [PATCH 1/3] packagegroup-base: only pull in dosfstools if licensing allows

[Andre McCurdy]

On Wed, Jan 22, 2020 at 6:46 AM Ross Burton <ross.burton@intel.com> wrote:
>
> packagegroup-base-vfat RRECOMMENDS on dosfstools, but this is GPLv3 so
> may be blacklisted.  Respect INCOMPATIBLE_LICENSE and don't recommend if
> GPL-3.0 has been blacklisted.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-core/packagegroups/packagegroup-base.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
> index 1f802da09b7..3476db09c35 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-base.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
> @@ -168,7 +168,7 @@ RRECOMMENDS_packagegroup-base-vfat = "\
>      kernel-module-vfat \
>      kernel-module-nls-iso8859-1 \
>      kernel-module-nls-cp437 \
> -    dosfstools"
> +    ${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPL-3.0", "", "dosfstools", d)}"

Should this be using incompatible_license_contains() instead of
bb.utils.contains()?

>  SUMMARY_packagegroup-base-alsa = "ALSA sound support"
>  RDEPENDS_packagegroup-base-alsa = "\
> --
> 2.20.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 1/3] packagegroup-base: only pull in dosfstools if licensing allows

[Ross Burton]

On 23/01/2020 19:49, Andre McCurdy wrote:
> Should this be using incompatible_license_contains() instead of
> bb.utils.contains()?

Yes, it should.  Thanks for reminding me of that function.

Ross