hal-backend-service: Change service name for public profile

In public, there would be a service: hal-backend-service
To accomplish this, service is renamed from hal-backend-service-device
to hal-backend-service.

Accordingly, the generator script and building scripts are modified to
check the prefix of service name to be "hal-backend-service", since the
checking prefix was "hal-backend-service-" which does not allow the
service name to be "hal-backend-service".

Change-Id: Iaa8a5707cee3a164d7b5e5c139a7d5d356999dad
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --git a/hal-backend-service/CMakeLists.txt b/hal-backend-service/CMakeLists.txt
index dfeeb64de7ce4f52975d94f32b137f616e9e9e06..cbd19c06bc7e8f3d3f86ed426ae9f898d61dcd63 100644 (file)
--- a/hal-backend-service/CMakeLists.txt
+++ b/hal-backend-service/CMakeLists.txt
@@ -35,6 +35,6 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${gtest_LDFLAGS} ${gtest_pkgs_LDFLAGS} -ld
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin/)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION lib/systemd/system
-       FILES_MATCHING PATTERN "hal-backend-service-*.service")
+       FILES_MATCHING PATTERN "hal-backend-service*.service")
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION lib/systemd/system
-       FILES_MATCHING PATTERN "hal-backend-service-*.socket")
+       FILES_MATCHING PATTERN "hal-backend-service*.socket")

diff --git a/hal-backend-service/config/hal-backend-service-config.json b/hal-backend-service/config/hal-backend-service-config.json
index ee4bdf2a808f45f636762fdfef3f847e582e51d9..afeda9441e4225f54d4b674a1b9b94f26b71d5cd 100644 (file)
--- a/hal-backend-service/config/hal-backend-service-config.json
+++ b/hal-backend-service/config/hal-backend-service-config.json
@@ -3,7 +3,7 @@
                {
                        "type": "systemd",
                        "property": {
-                               "name": "hal-backend-service-device"
+                               "name": "hal-backend-service"
                        },
                        "thread": [
                                { "hal_module_name": [ "device_display" ] },

diff --git a/hal-backend-service/config_types.py b/hal-backend-service/config_types.py
index d93f99e5f23e34b48ab9a1b6986e84217f086be2..76e084e8f571ff9dbd3817a588b5c3d318b96d6f 100644 (file)
--- a/hal-backend-service/config_types.py
+++ b/hal-backend-service/config_types.py
@@ -95,7 +95,7 @@ class HalBackendServiceSystemdPropertyConfig(JsonConfigEntity):
         if type(name_obj) != str:
             raise InvalidJsonStructException("Invalid json struct: systemd name should be a string")
 
-        service_name_prefix = "hal-backend-service-"
+        service_name_prefix = "hal-backend-service"
         if not name_obj.startswith(service_name_prefix):
             raise InvalidJsonValueException(f"Invalid json value: systemd name should start with {service_name_prefix}")
 

diff --git a/packaging/hal-api-common.spec b/packaging/hal-api-common.spec
index ba9fc60b42c9f6e5e5a741b4f12df7a02ba40cb0..1c5fdd5aba4950f37dcb6482f27660cd4d765b06 100644 (file)
--- a/packaging/hal-api-common.spec
+++ b/packaging/hal-api-common.spec
@@ -139,12 +139,12 @@ install -D -m 0755 %{SOURCE9} %{buildroot}%{_datadir}/upgrade/scripts/500.%{name
 
 %if %{enable_hal_backend_service}
 
-for HAL_BACKEND_SERVICE_SERVICE in $(ls hal-backend-service/hal-backend-service-*.service); do
+for HAL_BACKEND_SERVICE_SERVICE in $(ls hal-backend-service/hal-backend-service*.service); do
 HAL_BACKEND_SERVICE_SERVICE=$(basename ${HAL_BACKEND_SERVICE_SERVICE})
 %install_service basic.target.wants ${HAL_BACKEND_SERVICE_SERVICE}
 done
 
-for HAL_BACKEND_SERVICE_SOCKET in $(ls hal-backend-service/hal-backend-service-*.socket); do
+for HAL_BACKEND_SERVICE_SOCKET in $(ls hal-backend-service/hal-backend-service*.socket); do
 HAL_BACKEND_SERVICE_SOCKET=$(basename ${HAL_BACKEND_SERVICE_SOCKET})
 %install_service sockets.target.wants ${HAL_BACKEND_SERVICE_SOCKET}
 done
@@ -181,10 +181,10 @@ rm -f %{_unitdir}/sysinit.target.wants/hal-compatibility-checker.service
 %{_datadir}/upgrade/scripts/500.%{name}.sh
 %if %{enable_hal_backend_service}
 %{_bindir}/hal-backend-service
-%{_unitdir}/sockets.target.wants/hal-backend-service-*.socket
-%{_unitdir}/basic.target.wants/hal-backend-service-*.service
-%{_unitdir}/hal-backend-service-*.socket
-%{_unitdir}/hal-backend-service-*.service
+%{_unitdir}/sockets.target.wants/hal-backend-service*.socket
+%{_unitdir}/basic.target.wants/hal-backend-service*.service
+%{_unitdir}/hal-backend-service*.socket
+%{_unitdir}/hal-backend-service*.service
 %endif
 
 %files -n %{devel_name}