packagegroup-base: only pull in dosfstools if licensing allows
PATCH 1/3 packagegroup-base: only pull in dosfstools if licensing allows
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.
--- meta/recipes-core/packagegroups/packagegroup-base.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/packagegroups/packagegroup-base.bb +1 -1
@@ -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 = "\
Signature · 1 line
2.20.1
PATCH 2/3 connman: add PACKAGECONFIG for the commandline client
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.
--- meta/recipes-connectivity/connman/connman.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
meta/recipes-connectivity/connman/connman.inc +3 -5
@@ -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
Signature · 1 line
2.20.1
PATCH 3/3 shared-mime-info: actually depends on itstool-native
In reply to Ross Burtonshared-mime-info needs itstool-native, not itstool. Fixing this removes itstool from the rdepends of shared-mime-info-dev.
--- meta/recipes-support/shared-mime-info/shared-mime-info_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/shared-mime-info/shared-mime-info_git.bb +1 -1
@@ -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"
Signature · 1 line
2.20.1
Quoted 15 lines · Ross Burton
packagegroup-base-vfat RRECOMMENDS on dosfstools, but this is GPLv3 so may be blacklisted. Respect
INCOMPATIBLE_LICENSEand don't recommend if GPL-3.0 has been blacklisted.Signed-off-by Ross Burton <[email protected]>--- meta/recipes-core/packagegroups/packagegroup-base.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-core/packagegroups/packagegroup-base.bb +0
-0
meta/recipes-core/packagegroups/packagegroup-base.bb RRECOMMENDS_packagegroup-base-vfat = "\ · line 171
Quoted 5 lines
meta/recipes-core/packagegroups/packagegroup-base.bb +1
-1@@ -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()?
Quoted 10 lines
meta/recipes-core/packagegroups/packagegroup-base.bb +0
-1SUMMARY_packagegroup-base-alsa = "ALSA sound support" RDEPENDS_packagegroup-base-alsa = "\ --2.20.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 2 lines · Andre McCurdy
Should this be using
incompatible_license_contains()instead ofbb.utils.contains()?
Yes, it should. Thanks for reminding me of that function.
Ross