pass-hal: rpi: Edit pass-hal.conf path into /usr/lib/tmpfiles.d

The configuration file should be located in /usr/lib/tmpfiles.d/
regardless of architecture type.

Change-Id: If0b3e96c9ac6e2a5aef8cb1411f89fe97dcf2728
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0491ca0a91d1e165bbd6c8cf0eaeabb29719781..8f1b264c99b0c1d85a4dd93ce30934d63bfe720f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,4 +22,4 @@ SET(CONF_FILES
        ${CMAKE_CURRENT_SOURCE_DIR}/scripts/pass.conf
        ${CMAKE_CURRENT_SOURCE_DIR}/scripts/pass-cpu0.conf)
 INSTALL(FILES ${CONF_FILES} DESTINATION ${CONF_DIR})
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/pass-hal.conf DESTINATION ${LIB_INSTALL_DIR}/tmpfiles.d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/pass-hal.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/tmpfiles.d)

diff --git a/packaging/pass-hal-rpi.spec b/packaging/pass-hal-rpi.spec
index 1c469454c9cddc6ab9f0cb7e6ef44b2d0d255521..063961d55754941cf3112781cdbb2b057acbf6bb 100644 (file)
--- a/packaging/pass-hal-rpi.spec
+++ b/packaging/pass-hal-rpi.spec
@@ -40,7 +40,7 @@ rm -rf %{buildroot}
 %make_install
 %post
 /sbin/ldconfig
-systemd-tmpfiles %{_libdir}/tmpfiles.d/pass-hal.conf --create
+systemd-tmpfiles %{_prefix}/lib/tmpfiles.d/pass-hal.conf --create
 if [ -f %{_unitdir}/pass.service ]; then
        systemctl try-restart pass.service
 fi
@@ -54,6 +54,6 @@ fi
 %files
 %manifest %{name}.manifest
 %{_libdir}/pass/*.so
-%{_libdir}/tmpfiles.d/pass-hal.conf
+%{_prefix}/lib/tmpfiles.d/pass-hal.conf
 %config %{_sysconfdir}/pass/pass.conf
 %config %{_sysconfdir}/pass/pass-cpu0.conf