Skip to content

Commit

Permalink
[plugins] Made dbuslog an external plugin. JB#51793
Browse files Browse the repository at this point in the history
If the platform doesn't want to provide a way to configure and
pull nfcd logs at runtime, it's now as simple as not installing
nfcd-dbuslog-plugin package.

This also eliminates direct dependency on libdbuslogserver-gio
package. It's only required by the logging plugin, which makes
perfect sense.
  • Loading branch information
monich committed Oct 30, 2020
1 parent a79e345 commit 9112838
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 442 deletions.
34 changes: 0 additions & 34 deletions plugins/Makefile
Expand Up @@ -231,40 +231,6 @@ $(RELEASE_DBUS_HANDLERS_BUILD_DIR):
$(COVERAGE_DBUS_HANDLERS_BUILD_DIR):
mkdir -p $@

#
# D-Bus log plugin
#

PKGS += libdbuslogserver-gio

DBUS_LOG_DIR = dbus_log
DBUS_LOG_SRC = dbus_log_plugin.c

DEBUG_DBUS_LOG_BUILD_DIR = $(DEBUG_BUILD_DIR)/$(DBUS_LOG_DIR)
RELEASE_DBUS_LOG_BUILD_DIR = $(RELEASE_BUILD_DIR)/$(DBUS_LOG_DIR)
COVERAGE_DBUS_LOG_BUILD_DIR = $(COVERAGE_BUILD_DIR)/$(DBUS_LOG_DIR)

DEBUG_DBUS_LOG_OBJS = $(DBUS_LOG_SRC:%.c=$(DEBUG_DBUS_LOG_BUILD_DIR)/%.o)
RELEASE_DBUS_LOG_OBJS = $(DBUS_LOG_SRC:%.c=$(RELEASE_DBUS_LOG_BUILD_DIR)/%.o)
COVERAGE_DBUS_LOG_OBJS = $(DBUS_LOG_SRC:%.c=$(COVERAGE_DBUS_LOG_BUILD_DIR)/%.o)

DEBUG_OBJS += $(DEBUG_DBUS_LOG_OBJS)
RELEASE_OBJS += $(RELEASE_DBUS_LOG_OBJS)
COVERAGE_OBJS += $(COVERAGE_DBUS_LOG_OBJS)

$(DEBUG_DBUS_LOG_OBJS): | $(DEBUG_DBUS_LOG_BUILD_DIR)
$(RELEASE_DBUS_LOG_OBJS): | $(RELEASE_DBUS_LOG_BUILD_DIR)
$(COVERAGE_DBUS_LOG_OBJS): | $(COVERAGE_DBUS_LOG_BUILD_DIR)

$(DEBUG_DBUS_LOG_BUILD_DIR):
mkdir -p $@

$(RELEASE_DBUS_LOG_BUILD_DIR):
mkdir -p $@

$(COVERAGE_DBUS_LOG_BUILD_DIR):
mkdir -p $@

#
# Tools and flags
#
Expand Down
4 changes: 0 additions & 4 deletions plugins/dbus_log/README

This file was deleted.

350 changes: 0 additions & 350 deletions plugins/dbus_log/dbus_log_plugin.c

This file was deleted.

0 comments on commit 9112838

Please sign in to comment.