From cc0e327e4f601e8f8750cc244faa36f6bc5d6b28 Mon Sep 17 00:00:00 2001 From: Tedd Ho-Jeong An Date: Mon, 21 Sep 2020 12:00:38 -0700 Subject: [PATCH] build: Add SPDX License Identifier This patch adds SPDX License Identifier and removes the license text. ------------------------------------- License COUNT ------------------------------------- GPL-2.0-or-later : 6 License: GPL-2.0-or-later Makefile.am Makefile.mesh Makefile.obexd Makefile.plugins Makefile.tools configure.ac Change-Id: I454a1299e5cb820af9812df678f552234cf02bfd Signed-off-by: Anuj Jain Signed-off-by: Ayush Garg --- Makefile.am | 2 +- Makefile.mesh | 1 + Makefile.obexd | 1 + Makefile.plugins | 2 +- Makefile.tools | 2 +- client/adv_monitor.c | 1 - configure.ac | 1 + src/adapter.h | 2 +- src/adv_monitor.c | 1 - src/device.c | 5 ++++- 10 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index c7c0b81..d975439 100755 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ - +# SPDX-License-Identifier: GPL-2.0 AM_MAKEFLAGS = --no-print-directory AM_CPPFLAGS = diff --git a/Makefile.mesh b/Makefile.mesh index af0fd03..68bf2de 100644 --- a/Makefile.mesh +++ b/Makefile.mesh @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 if MESH if DATAFILES diff --git a/Makefile.obexd b/Makefile.obexd index 06bf59c..19184a4 100755 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 if SYSTEMD #systemduserunitdir = @SYSTEMD_USERUNITDIR@ systemduserunitdir = $(SYSTEMD_SYSTEMUNITDIR) diff --git a/Makefile.plugins b/Makefile.plugins index 022603c..a95f9e3 100755 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -1,4 +1,4 @@ - +# SPDX-License-Identifier: GPL-2.0 builtin_modules += hostname builtin_sources += plugins/hostname.c diff --git a/Makefile.tools b/Makefile.tools index c5db037..73a0eb2 100755 --- a/Makefile.tools +++ b/Makefile.tools @@ -1,4 +1,4 @@ - +# SPDX-License-Identifier: GPL-2.0 if CLIENT bin_PROGRAMS += client/bluetoothctl diff --git a/client/adv_monitor.c b/client/adv_monitor.c index 90ab0be..579d9e7 100644 --- a/client/adv_monitor.c +++ b/client/adv_monitor.c @@ -12,7 +12,6 @@ #include #endif -#define _GNU_SOURCE #include #include #include diff --git a/configure.ac b/configure.ac index 11b3e6b..7a09b7f 100755 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 AC_PREREQ(2.60) AC_INIT(bluez, 5.55) diff --git a/src/adapter.h b/src/adapter.h index 2123ff8..3b5573c 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -328,7 +328,7 @@ enum kernel_features { KERNEL_HAS_RESUME_EVT = 1 << 4, }; -bool bts_has_kernel_features(uint32_t feature); +bool btd_has_kernel_features(uint32_t feature); #ifdef TIZEN_FEATURE_BLUEZ_MODIFY void adapter_send_event(const char *event); diff --git a/src/adv_monitor.c b/src/adv_monitor.c index e441a55..fe3d469 100644 --- a/src/adv_monitor.c +++ b/src/adv_monitor.c @@ -12,7 +12,6 @@ #include #endif -#define _GNU_SOURCE #include #include #include diff --git a/src/device.c b/src/device.c index 13026c7..0c85002 100644 --- a/src/device.c +++ b/src/device.c @@ -5425,7 +5425,9 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type) { struct bearer_state *state = get_state(device, bdaddr_type); DBusMessage *reply; +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY bool remove_device = false; +#endif #ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *dev_name = device->name; #endif @@ -5470,10 +5472,11 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type) while (device->disconnects) { DBusMessage *msg = device->disconnects->data; +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (dbus_message_is_method_call(msg, ADAPTER_INTERFACE, "RemoveDevice")) remove_device = true; - +#endif g_dbus_send_reply(dbus_conn, msg, DBUS_TYPE_INVALID); device->disconnects = g_slist_remove(device->disconnects, msg); dbus_message_unref(msg); -- 2.7.4