summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordan Markuš <gordan.markus@pelagicore.com>2017-07-03 15:14:56 +0200
committerGordan Markuš <gordan.markus@pelagicore.com>2017-07-03 15:14:56 +0200
commit103be9f0bb77df0b139541ab366ff98a4fe4e408 (patch)
treef871565b7aa5b43eea5989a7a10cd2d02ed98fb6
parenteeac12ced6f5441846fc6afcb0eff0461feb8bef (diff)
downloadpersistence-common-object-103be9f0bb77df0b139541ab366ff98a4fe4e408.tar.gz
dbus_config: Remove dbus configuration file
The same copy of the default dbus configuration file can be found in https://github.com/GENIVI/persistence-client-library and that should be the only repository holding this file. Furthermore, because this file is being installed by both of these components, the Yocto build system will declared the do_rootfs job as a failure due to the following error: Error: Transaction check error: file /etc/dbus-1/system.d/org.genivi.persistence.admin.conf conflicts between attempted installs of persistence-client-library-1.1.0 and libpers-common0-1.0.3 Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
-rw-r--r--dbus_config/org.genivi.persistence.admin.conf16
-rw-r--r--src/Makefile.am2
2 files changed, 0 insertions, 18 deletions
diff --git a/dbus_config/org.genivi.persistence.admin.conf b/dbus_config/org.genivi.persistence.admin.conf
deleted file mode 100644
index fac05f9..0000000
--- a/dbus_config/org.genivi.persistence.admin.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
- <!-- Only root can own the service -->
- <policy user="root">
- <allow own="org.genivi.persistence.admin"/>
- <allow send_destination="org.genivi.persistence.admin"/>
- <allow send_interface="org.genivi.persistence.admin"/>
- </policy>
- <policy context="default">
- <allow send_destination="org.genivi.persistence.admin"/>
- <allow send_interface="org.genivi.persistence.admin"/>
- </policy>
-</busconfig> \ No newline at end of file
diff --git a/src/Makefile.am b/src/Makefile.am
index 15231bc..2294605 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -114,8 +114,6 @@ libpers_common_la_LIBADD += \
$(RAWDB_LIBS)
endif
-dbuspolicy_DATA = ../dbus_config/org.genivi.persistence.admin.conf
-
# Export interface description of org.genivi.persistence.admin DBus interface
dbusinterfaces_DATA = ../dbus_specifications/org.genivi.persistence.admin.xml