From 103be9f0bb77df0b139541ab366ff98a4fe4e408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gordan=20Marku=C5=A1?= Date: Mon, 3 Jul 2017 15:14:56 +0200 Subject: dbus_config: Remove dbus configuration file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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š --- dbus_config/org.genivi.persistence.admin.conf | 16 ---------------- src/Makefile.am | 2 -- 2 files changed, 18 deletions(-) delete mode 100644 dbus_config/org.genivi.persistence.admin.conf 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 @@ - - - - - - - - - - - - - - \ 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 -- cgit v1.2.1