[Buildroot] [PATCH 1/1] package/dbus-python: drop dbus-glib dependency
Arnout Vandecappelle
arnout at mind.be
Tue Oct 29 23:43:49 UTC 2019
On 27/10/2019 15:28, Fabrice Fontaine wrote:
> dbus-glib is not required since version 1.2.8 and
> https://github.com/freedesktop/dbus-python/commit/28098f2c7c23bdef9247c5dfbb8437ca3f03dac4
>
> So drop it and add dbus-gmain/COPYING to license files
To be precise: they copied part of dbus-glib and use that instead; it is no
longer possible to use an unbundled dbus-glib. So I've added that to the commit
message and applied to master, thanks.
Regards,
Arnout
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ---
> package/dbus-python/Config.in | 2 +-
> package/dbus-python/dbus-python.hash | 1 +
> package/dbus-python/dbus-python.mk | 8 ++++----
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in
> index 332726348d..4bfb59ed91 100644
> --- a/package/dbus-python/Config.in
> +++ b/package/dbus-python/Config.in
> @@ -4,7 +4,7 @@ config BR2_PACKAGE_DBUS_PYTHON
> depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
> depends on BR2_PACKAGE_DBUS
> depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
> - select BR2_PACKAGE_DBUS_GLIB
> + select BR2_PACKAGE_LIBGLIB2
> # pyexpat: runtime dependency only
> select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON
> select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3
> diff --git a/package/dbus-python/dbus-python.hash b/package/dbus-python/dbus-python.hash
> index d5448249b4..58b0a75908 100644
> --- a/package/dbus-python/dbus-python.hash
> +++ b/package/dbus-python/dbus-python.hash
> @@ -3,3 +3,4 @@ sha256 cdd4de2c4f5e58f287b12013ed7b41dee81d503c8d0d2397c5bd2fb01badf260 dbus-pyt
>
> # Locally calculated
> sha256 1e4562245383fdb5203b1769789e5b28bba21af4923aea7e8b2614f7f93623c0 COPYING
> +sha256 064523e3ab64d6f03904132b2cc4a1bd8500586edb4cd050c2ff2b96aed4c33b dbus-gmain/COPYING
> diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk
> index 33f2358876..cf4882d8ee 100644
> --- a/package/dbus-python/dbus-python.mk
> +++ b/package/dbus-python/dbus-python.mk
> @@ -7,10 +7,10 @@
> DBUS_PYTHON_VERSION = 1.2.12
> DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python
> DBUS_PYTHON_INSTALL_STAGING = YES
> -DBUS_PYTHON_LICENSE = MIT
> -DBUS_PYTHON_LICENSE_FILES = COPYING
> -DBUS_PYTHON_DEPENDENCIES = dbus-glib
> -HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus-glib
> +DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain)
> +DBUS_PYTHON_LICENSE_FILES = COPYING dbus-gmain/COPYING
> +DBUS_PYTHON_DEPENDENCIES = dbus libglib2
> +HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2
>
> ifeq ($(BR2_PACKAGE_PYTHON),y)
> DBUS_PYTHON_DEPENDENCIES += python host-python
>
More information about the buildroot
mailing list