hal-backend-service: Move install path to /usr/bin/hal to use dlconf

Move install path of hal-backend-service from /usr/bin to /usr/bin/hal
to use DLConf(Dynamic Loader Configuration) feature which support to
load multi-version library under /hal. When executing process
under /usr/bin/hal or /hal/bin, DLConf is applied.

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

diff --git a/hal-backend-service/CMakeLists.txt b/hal-backend-service/CMakeLists.txt
index cbd19c06bc7e8f3d3f86ed426ae9f898d61dcd63..b4b823fcb4865ecce0a78faca72aae652fd80c69 100644 (file)
--- a/hal-backend-service/CMakeLists.txt
+++ b/hal-backend-service/CMakeLists.txt
@@ -32,7 +32,7 @@ SET(src
 MESSAGE("${PROJECT_NAME}")
 ADD_EXECUTABLE(${PROJECT_NAME} ${src})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${gtest_LDFLAGS} ${gtest_pkgs_LDFLAGS} -ldl -L${LIBDIR}/hal)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin/)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin/hal)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION lib/systemd/system
        FILES_MATCHING PATTERN "hal-backend-service*.service")

diff --git a/hal-backend-service/hal-backend-service.service.in b/hal-backend-service/hal-backend-service.service.in
index 7f493a9fb4825a7be59e3acf6c4b0559ac4dc613..b607f1ce0b289c573884c59b21e5063136dfe9cd 100644 (file)
--- a/hal-backend-service/hal-backend-service.service.in
+++ b/hal-backend-service/hal-backend-service.service.in
@@ -7,7 +7,7 @@ After=local-fs.target tizen-system-env.service systemd-tmpfiles-setup.service @S
 [Service]
 Type=simple
 SmackProcessLabel=System
-ExecStart=/usr/bin/hal-backend-service --stub-proc-name '@PROC_NAME@' @THREADS@
+ExecStart=/usr/bin/hal/hal-backend-service --stub-proc-name '@PROC_NAME@' @THREADS@
 Restart=on-failure
 RestartSec=0
 KillSignal=SIGUSR1

diff --git a/packaging/hal-api-common.spec b/packaging/hal-api-common.spec
index 1c5fdd5aba4950f37dcb6482f27660cd4d765b06..e67db99558fa33c9562b9c7aec87af988c88bf85 100644 (file)
--- a/packaging/hal-api-common.spec
+++ b/packaging/hal-api-common.spec
@@ -180,7 +180,7 @@ rm -f %{_unitdir}/sysinit.target.wants/hal-compatibility-checker.service
 %endif
 %{_datadir}/upgrade/scripts/500.%{name}.sh
 %if %{enable_hal_backend_service}
-%{_bindir}/hal-backend-service
+%{_bindir}/hal/hal-backend-service
 %{_unitdir}/sockets.target.wants/hal-backend-service*.socket
 %{_unitdir}/basic.target.wants/hal-backend-service*.service
 %{_unitdir}/hal-backend-service*.socket