[Buildroot] [PATCH 1/1] package/ussp-push: add bluez5_utils support

[Buildroot] [PATCH 1/1] package/ussp-push: add bluez5_utils support

[Fabrice Fontaine]

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/ussp-push/Config.in    | 2 +-
 package/ussp-push/ussp-push.mk | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
index aefec85a20..d0ab577609 100644
--- a/package/ussp-push/Config.in
+++ b/package/ussp-push/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_USSP_PUSH
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_OPENOBEX
-	select BR2_PACKAGE_BLUEZ_UTILS
+	select BR2_PACKAGE_BLUEZ_UTILS if !BR2_PACKAGE_BLUEZ5_UTILS
 	help
 	  ussp-push is an OBEX object pusher for Linux, using the BlueZ
 	  BlueTooth stack.
diff --git a/package/ussp-push/ussp-push.mk b/package/ussp-push/ussp-push.mk
index 0c45c291ac..e56b611727 100644
--- a/package/ussp-push/ussp-push.mk
+++ b/package/ussp-push/ussp-push.mk
@@ -9,6 +9,8 @@ USSP_PUSH_SITE = http://www.xmailserver.org
 USSP_PUSH_LICENSE = GPL-2.0+
 USSP_PUSH_LICENSE_FILES = COPYING
 
-USSP_PUSH_DEPENDENCIES = bluez_utils openobex
+USSP_PUSH_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils,bluez5_utils) \
+	openobex
 
 $(eval $(autotools-package))
-- 
2.24.1

[Buildroot] [PATCH 1/1] package/ussp-push: add bluez5_utils support

[Thomas Petazzoni]

On Sat, 11 Jan 2020 10:21:01 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/ussp-push/Config.in    | 2 +-
>  package/ussp-push/ussp-push.mk | 4 +++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
> index aefec85a20..d0ab577609 100644
> --- a/package/ussp-push/Config.in
> +++ b/package/ussp-push/Config.in
> @@ -5,7 +5,7 @@ config BR2_PACKAGE_USSP_PUSH
>  	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
>  	depends on BR2_USE_MMU # dbus
>  	select BR2_PACKAGE_OPENOBEX
> -	select BR2_PACKAGE_BLUEZ_UTILS
> +	select BR2_PACKAGE_BLUEZ_UTILS if !BR2_PACKAGE_BLUEZ5_UTILS

Doing this causes a Kconfig circular dependency:

package/bluez_utils/Config.in:1:error: recursive dependency detected!
package/bluez_utils/Config.in:1:	symbol BR2_PACKAGE_BLUEZ_UTILS is selected by BR2_PACKAGE_BLUEZ5_UTILS
package/bluez5_utils/Config.in:1:	symbol BR2_PACKAGE_BLUEZ5_UTILS is selected by BR2_PACKAGE_BLUEZ_ALSA
package/bluez-alsa/Config.in:1:	symbol BR2_PACKAGE_BLUEZ_ALSA depends on BR2_PACKAGE_BLUEZ_UTILS

This problem also affects your cwiid and sconeserver patches.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] package/ussp-push: add bluez5_utils support

[Fabrice Fontaine]

Dear Thomas,

Le sam. 11 janv. 2020 ? 15:32, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> a ?crit :
>
> On Sat, 11 Jan 2020 10:21:01 +0100
> Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
>
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > ---
> >  package/ussp-push/Config.in    | 2 +-
> >  package/ussp-push/ussp-push.mk | 4 +++-
> >  2 files changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
> > index aefec85a20..d0ab577609 100644
> > --- a/package/ussp-push/Config.in
> > +++ b/package/ussp-push/Config.in
> > @@ -5,7 +5,7 @@ config BR2_PACKAGE_USSP_PUSH
> >       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
> >       depends on BR2_USE_MMU # dbus
> >       select BR2_PACKAGE_OPENOBEX
> > -     select BR2_PACKAGE_BLUEZ_UTILS
> > +     select BR2_PACKAGE_BLUEZ_UTILS if !BR2_PACKAGE_BLUEZ5_UTILS
>
> Doing this causes a Kconfig circular dependency:
>
> package/bluez_utils/Config.in:1:error: recursive dependency detected!
> package/bluez_utils/Config.in:1:        symbol BR2_PACKAGE_BLUEZ_UTILS is selected by BR2_PACKAGE_BLUEZ5_UTILS
> package/bluez5_utils/Config.in:1:       symbol BR2_PACKAGE_BLUEZ5_UTILS is selected by BR2_PACKAGE_BLUEZ_ALSA
> package/bluez-alsa/Config.in:1: symbol BR2_PACKAGE_BLUEZ_ALSA depends on BR2_PACKAGE_BLUEZ_UTILS
>
> This problem also affects your cwiid and sconeserver patches.
OK, I made these changes to prepare the drop of bluez_utils in an
upcoming patch.
How should I proceed? Should I just replace bluez_utils by
bluez5_utils in this upcoming patch?
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Best Regards,

Fabrice