Change configuration location into an etc directory.

Change-Id: I4648f2eb203f37844bfb8deb2527f93b4852e82c
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7fd7e06..3c23140 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -102,9 +102,9 @@ add_custom_command(
        OUTPUT ${PROJECT_NAME}.wgt
        DEPENDS ${PROJECT_NAME} bitfield isotp uds openxc config.xml.in can_buses.json.in
        COMMAND rm -rf package
-       COMMAND mkdir -p package/${PROJECT_LIBDIR} package/htdocs
+       COMMAND mkdir -p package/${PROJECT_LIBDIR} package/htdocs package/etc
        COMMAND cp config.xml package/
-       COMMAND cp can_buses.json package/
+       COMMAND cp can_buses.json package/etc
        COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_ICON} package/icon.png
        COMMAND cp ${PROJECT_NAME}.so package/libs
        COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt package

diff --git a/src/configuration.hpp b/src/configuration.hpp
index 321b96e..82bcbc7 100644 (file)
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -41,7 +41,7 @@
 class configuration_t
 {
        private:
-               can_bus_t can_bus_manager_ = can_bus_t(afb_daemon_rootdir_open_locale(binder_interface->daemon, "can_buses.json", O_RDONLY, NULL));
+               can_bus_t can_bus_manager_ = can_bus_t(afb_daemon_rootdir_open_locale(binder_interface->daemon, "etc/can_buses.json", O_RDONLY, NULL));
                diagnostic_manager_t diagnostic_manager_;
                uint8_t active_message_set_ = 0;
                std::vector<std::string> signals_prefix_;