Skip to contentSkip to conversation

package/ussp-push: add bluez5_utils support

PATCH New Fabrice Fontaine 2 participants 3 messages Jan 11, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/ussp-push: add bluez5_utils support

---
 package/ussp-push/Config.in    | 2 +-
 package/ussp-push/ussp-push.mk | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
package/ussp-push/Config.in +1 -1
index aefec85a20..d0ab577609 100644
@@ -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.
package/ussp-push/ussp-push.mk +3 -1
index 0c45c291ac..e56b611727 100644
@@ -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))
Signature · 1 line
2.24.1
#1 lore raw

PATCH 1/1 package/ussp-push: add bluez5_utils support

Quoted 11 lines · On Sat, 11 Jan 2020 10:21:01 +0100 Fabrice Fontaine…
---
 package/ussp-push/Config.in    | 2 +-
 package/ussp-push/ussp-push.mk | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
package/ussp-push/Config.in +0 -0
index aefec85a20..d0ab577609 100644

package/ussp-push/Config.in config BR2_PACKAGE_USSP_PUSH · line 8

Quoted 5 lines
package/ussp-push/Config.in +1 -1
@@ -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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/ussp-push: add bluez5_utils support

Dear Thomas,

Le sam. 11 janv. 2020 ? 15:32, Thomas Petazzoni
<[email protected]> a ?crit :

Quoted 23 lines
Quoted 11 lines · On Sat, 11 Jan 2020 10:21:01 +0100 Fabrice Fontaine…
---
 package/ussp-push/Config.in    | 2 +-
 package/ussp-push/ussp-push.mk | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
package/ussp-push/Config.in +0 -0
index aefec85a20..d0ab577609 100644

package/ussp-push/Config.in config BR2_PACKAGE_USSP_PUSH · line 8

Quoted 5 lines
package/ussp-push/Config.in +1 -1
@@ -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:

Quoted 6 lines

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?

Quoted 6 lines

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

Best Regards,

Fabrice