Adding Makelist support for virtual sensor configuration

- Added xml configuration support for CMakelist
- Updated spec file for virtual sensor xml

Change-Id: I8b9be20f0f3d4ae728a172237640454e4880de36

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b555de81029e87add94cc67511eefb0e4f3fe640..edc7d9b09e268764c1355d3f547fc1b0a747b3d9 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,16 +33,20 @@ ENDIF("${ARCH}" MATCHES "^arm.*")
 IF("${ARCH}" MATCHES "^arm.*")
        CONFIGURE_FILE(sensor_plugins.xml.in sensor_plugins.xml @ONLY)
        CONFIGURE_FILE(sensors.xml.in sensors.xml @ONLY)
+       CONFIGURE_FILE(virtual_sensors.xml.in virtual_sensors.xml @ONLY)
        install(FILES
                sensor_plugins.xml
                sensors.xml
+               virtual_sensors.xml
                DESTINATION etc)
 ELSE("${ARCH}" MATCHES "^arm.*")
        CONFIGURE_FILE(sensor_plugins_sim.xml.in sensor_plugins.xml @ONLY)
        CONFIGURE_FILE(sensors.xml.in sensors.xml @ONLY)
+       CONFIGURE_FILE(virtual_sensors.xml.in virtual_sensors.xml @ONLY)
        install(FILES
                sensor_plugins.xml
                sensors.xml
+               virtual_sensors.xml
                DESTINATION etc)
 ENDIF("${ARCH}" MATCHES "^arm.*")
 

diff --git a/packaging/sensord.spec b/packaging/sensord.spec
index 1d305ff464e6c0c8d76dc546ac743095bee1c3a6..88d4f71c3551ba857cfb9da232498b3f9a5e1411 100755 (executable)
--- a/packaging/sensord.spec
+++ b/packaging/sensord.spec
@@ -108,6 +108,7 @@ systemctl daemon-reload
 %{_bindir}/sensord
 %attr(0644,root,root)/usr/etc/sensor_plugins.xml
 %attr(0644,root,root)/usr/etc/sensors.xml
+%attr(0644,root,root)/usr/etc/virtual_sensors.xml
 %{_unitdir}/sensord.service
 %{_unitdir}/sensord.socket
 %{_unitdir}/multi-user.target.wants/sensord.service

diff --git a/src/libsensord/CMakeLists.txt b/src/libsensord/CMakeLists.txt
index 6686be239f575e22502810eb1bd6c1ba58740e50..87dac4e01b518aee648670f80b4297e8228181bb 100755 (executable)
--- a/src/libsensord/CMakeLists.txt
+++ b/src/libsensord/CMakeLists.txt
@@ -70,5 +70,6 @@ install(FILES sensor_context.h DESTINATION include/sensor/)
 install(FILES sensor_gravity.h DESTINATION include/sensor/)
 install(FILES sensor_linear_accel.h DESTINATION include/sensor/)
 install(FILES sensor_orientation.h DESTINATION include/sensor/)
+install(FILES sensor_rv.h DESTINATION include/sensor/)
 install(FILES sensor_temperature.h DESTINATION include/sensor/)
 install(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)