Skip to contentSkip to conversation

bluez4: Remove support

PATCH Applied Denis Kenzior 2 participants 2 messages Apr 6, 2024 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bluez4: Remove support

BlueZ 5 is now up to release 5.73, with the 5.0 release date being in late 2012. There's very little chance that anyone is using BlueZ 4 anymore. Remove it.

---
 Makefile.am             |   32 +-
 btio/btio.c             | 1447 ---------------------------------------
 btio/btio.h             |  110 ---
 configure.ac            |    1 -
 dundee/bluez4.c         |  296 --------
 plugins/bluez4.c        |  988 --------------------------
 plugins/bluez4.h        |   84 ---
 plugins/dun_gw_bluez4.c |  172 -----
 plugins/hfp_ag_bluez4.c |  218 ------
 plugins/hfp_hf_bluez4.c |  554 ---------------
 plugins/sap.c           |  363 ----------
 11 files changed, 1 insertion(+), 4264 deletions(-)
 delete mode 100644 btio/btio.c
 delete mode 100644 btio/btio.h
 delete mode 100644 dundee/bluez4.c
 delete mode 100644 plugins/bluez4.c
 delete mode 100644 plugins/bluez4.h
 delete mode 100644 plugins/dun_gw_bluez4.c
 delete mode 100644 plugins/hfp_ag_bluez4.c
 delete mode 100644 plugins/hfp_hf_bluez4.c
 delete mode 100644 plugins/sap.c
Makefile.am +1 -31
index 3e545e8f11de..9a6f82c39552 100644
@@ -262,8 +262,6 @@ gril_sources = gril/gril.h gril/gril.c \
 				gril/parcel.c gril/parcel.h \
 				gril/ril_constants.h
 
-btio_sources = btio/btio.h btio/btio.c
-
 if UDEV
 builtin_cflags += @UDEV_CFLAGS@
 builtin_libadd += @UDEV_LIBS@
@@ -577,16 +575,6 @@ builtin_modules += connman
 builtin_sources += plugins/connman.c
 
 if BLUETOOTH
-if BLUEZ4
-builtin_modules += sap
-builtin_sources += plugins/sap.c plugins/bluez4.h
-
-builtin_modules += hfp_bluez4
-builtin_sources += plugins/hfp_hf_bluez4.c plugins/bluez4.h
-
-builtin_modules += dun_gw_bluez4
-builtin_sources += plugins/dun_gw_bluez4.c plugins/bluez4.h
-else
 builtin_modules += hfp_bluez5
 builtin_sources += plugins/hfp_hf_bluez5.c plugins/bluez5.h
 
@@ -594,26 +582,13 @@ builtin_modules += dun_gw_bluez5
 builtin_sources += plugins/dun_gw_bluez5.c plugins/bluez5.h
 endif
 endif
-endif
 
 if BLUETOOTH
-if BLUEZ4
-builtin_modules += bluez4
-builtin_sources += plugins/bluez4.c plugins/bluez4.h
-
-builtin_modules += hfp_ag_bluez4
-builtin_sources += plugins/hfp_ag_bluez4.c plugins/bluez4.h
-
-builtin_sources += $(btio_sources)
-builtin_cflags += @BLUEZ_CFLAGS@
-builtin_libadd += @BLUEZ_LIBS@
-else
 builtin_modules += bluez5
 builtin_sources += plugins/bluez5.c plugins/bluez5.h
 
 builtin_modules += hfp_ag_bluez5
 builtin_sources += plugins/hfp_ag_bluez5.c plugins/bluez5.h
-endif
 
 if UPOWER
 builtin_modules += upower
@@ -709,7 +684,7 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ $(ell_cflags) $(builtin_cflags) \
 
 AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/src \
 			-I$(srcdir)/gdbus -I$(srcdir)/gisi -I$(srcdir)/gatchat \
-			-I$(srcdir)/btio -I$(srcdir)/gril
+			-I$(srcdir)/gril
 
 doc_files = doc/overview.txt doc/ofono-paper.txt doc/release-faq.txt \
 		doc/manager-api.txt doc/modem-api.txt doc/network-api.txt \
@@ -1022,15 +997,10 @@ systemdunit_DATA += dundee/dundee.service
 endif
 endif
 
-if BLUEZ4
-dundee_dundee_SOURCES = $(dundee_common_sources) $(btio_sources) \
-			plugins/bluez4.c dundee/bluez4.c
-else
 dundee_dundee_SOURCES = $(dundee_common_sources) plugins/bluez5.c \
 			dundee/bluez5.c
 endif
 endif
-endif
 
 noinst_PROGRAMS += gatchat/gsmdial gatchat/test-server gatchat/test-qcdm
 
btio/btio.c deleted +0 -1447

1,447 lines not on this page · raw message

btio/btio.h deleted +0 -110

110 lines not on this page · raw message

configure.ac +0 -1
index 19adf3698c75..8eb8dd048fdb 100644
@@ -247,7 +247,6 @@ if (test "${enable_bluez4}" = "yes"); then
 	AC_SUBST(BLUEZ_LIBS)
 fi
 
-AM_CONDITIONAL(BLUEZ4, test "${enable_bluetooth}" != "no" && test "${enable_bluez4}" = "yes")
 AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no")
 
 AC_ARG_ENABLE(upower, AS_HELP_STRING([--disable-upower],
dundee/bluez4.c deleted +0 -296

296 lines not on this page · raw message

plugins/bluez4.c deleted +0 -988

988 lines not on this page · raw message

plugins/bluez4.h deleted +0 -84

79 lines not on this page · raw message

plugins/dun_gw_bluez4.c deleted +0 -172

172 lines not on this page · raw message

plugins/hfp_ag_bluez4.c deleted +0 -218

218 lines not on this page · raw message

plugins/hfp_hf_bluez4.c deleted +0 -554

554 lines not on this page · raw message

plugins/sap.c deleted +0 -363

363 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.43.0

Part of the diff is not shown here. View the raw message.

#1 lore raw
This patch was applied to ofono.git (master) by Denis Kenzior <[email protected]>:

Hello:

This patch was applied to ofono.git (master)
by Denis Kenzior <[email protected]>:

Quoted 17 lines · On Sat, 6 Apr 2024 14:55:35 -0500 you wrote:

BlueZ 5 is now up to release 5.73, with the 5.0 release date being in late 2012. There's very little chance that anyone is using BlueZ 4 anymore. Remove it.

---
 Makefile.am             |   32 +-
 btio/btio.c             | 1447 ---------------------------------------
 btio/btio.h             |  110 ---
 configure.ac            |    1 -
 dundee/bluez4.c         |  296 --------
 plugins/bluez4.c        |  988 --------------------------
 plugins/bluez4.h        |   84 ---
 plugins/dun_gw_bluez4.c |  172 -----
 plugins/hfp_ag_bluez4.c |  218 ------
 plugins/hfp_hf_bluez4.c |  554 ---------------
 plugins/sap.c           |  363 ----------
 11 files changed, 1 insertion(+), 4264 deletions(-)
 delete mode 100644 btio/btio.c
Quoted 8 lines
 delete mode 100644 btio/btio.h
 delete mode 100644 dundee/bluez4.c
 delete mode 100644 plugins/bluez4.c
 delete mode 100644 plugins/bluez4.h
 delete mode 100644 plugins/dun_gw_bluez4.c
 delete mode 100644 plugins/hfp_ag_bluez4.c
 delete mode 100644 plugins/hfp_hf_bluez4.c
 delete mode 100644 plugins/sap.c

Here is the summary with links:
- bluez4: Remove support

    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=6bd9bd2c9efa

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html