pass-hal: tm2: Use only /usr/lib/tmpfiles.d path for pass-hal.conf

Even if architecture is aarch64, the systemd spec applies the rule files
under the /usr/lib/tmpfiles.d. On aarch64, /usr/lib64/tmpfiles.d/pass-hal.conf
is not applied. So, this patch changes the path of tmpfiles.d in order to
support the PASS on aarch64. So, this patch changes the tmpfiles.d path
to support the PASS on aarch64 as following:
- /usr/lib64/tmpfiles.d -> /usr/lib/tmpfiles.d

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index edef99c..a78b065 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,4 +25,4 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/pass-resource1.conf DESTINATIO
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/pass-resource2.conf DESTINATION /etc/pass)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/pass-resource3.conf DESTINATION /etc/pass)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/pass-resource4.conf DESTINATION /etc/pass)
-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 /usr/lib/tmpfiles.d)

diff --git a/packaging/pass-hal-tm2.spec b/packaging/pass-hal-tm2.spec
index 3dbec3e..6905672 100644 (file)
--- a/packaging/pass-hal-tm2.spec
+++ b/packaging/pass-hal-tm2.spec
@@ -38,7 +38,7 @@ rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
-systemd-tmpfiles %{_libdir}/tmpfiles.d/pass-hal.conf --create
+systemd-tmpfiles /usr/lib/tmpfiles.d/pass-hal.conf --create
 if [ -f %{_unitdir}/pass.service ]; then
        systemctl | grep pass.service  | awk '{if ($3 == "active" && $4 == "running") system("systemctl restart pass.service")}'
 fi
@@ -52,7 +52,7 @@ fi
 %files
 %manifest %{name}.manifest
 %{_libdir}/pass/*.so
-%{_libdir}/tmpfiles.d/pass-hal.conf
+/usr/lib/tmpfiles.d/pass-hal.conf
 
 %config %{_sysconfdir}/pass/pass.conf
 %config %{_sysconfdir}/pass/pass-resource0.conf