From 07692eb39561fe267a4a73ca423c651395650748 Mon Sep 17 00:00:00 2001 From: Youngjae Cho Date: Thu, 5 Aug 2021 09:35:15 +0900 Subject: [PATCH] Rename iot package to iot-headed There iot-headless will be added. Therefore, to distinguish those two iot headed/headless profiles, rename the existing iot to iot-headed. Change-Id: I590ad8122723d7f6e2c5273aaa000d091378e6ab Signed-off-by: Youngjae Cho --- CMakeLists.txt | 4 ++-- conf/{iot-display.conf => iot-headed-display.conf} | 0 packaging/deviced.spec | 16 ++++++++-------- plugins/{iot => iot-headed}/display/CMakeLists.txt | 4 ++-- plugins/{iot => iot-headed}/display/core.c | 0 plugins/{iot => iot-headed}/display/device-interface.c | 0 plugins/{iot => iot-headed}/display/key-filter.c | 0 7 files changed, 12 insertions(+), 12 deletions(-) rename conf/{iot-display.conf => iot-headed-display.conf} (100%) rename plugins/{iot => iot-headed}/display/CMakeLists.txt (95%) rename plugins/{iot => iot-headed}/display/core.c (100%) rename plugins/{iot => iot-headed}/display/device-interface.c (100%) rename plugins/{iot => iot-headed}/display/key-filter.c (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 260a022..c2d30f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -336,7 +336,7 @@ SET(SRCS ${SRCS} ${DISPLAY_SRCS}) ADD_SUBDIRECTORY(plugins/mobile/display) ADD_SUBDIRECTORY(plugins/wearable/display) ADD_SUBDIRECTORY(plugins/tv/display) -ADD_SUBDIRECTORY(plugins/iot/display) +ADD_SUBDIRECTORY(plugins/iot-headed/display) IF(BATTERY_MODULE STREQUAL on) ADD_SUBDIRECTORY(plugins/mobile/battery) ADD_SUBDIRECTORY(plugins/wearable/battery) @@ -344,4 +344,4 @@ ENDIF() INSTALL_CONF(conf mobile-display) INSTALL_CONF(conf wearable-display) INSTALL_CONF(conf tv-display) -INSTALL_CONF(conf iot-display) +INSTALL_CONF(conf iot-headed-display) diff --git a/conf/iot-display.conf b/conf/iot-headed-display.conf similarity index 100% rename from conf/iot-display.conf rename to conf/iot-headed-display.conf diff --git a/packaging/deviced.spec b/packaging/deviced.spec index 8261d44..bcd7146 100644 --- a/packaging/deviced.spec +++ b/packaging/deviced.spec @@ -112,12 +112,12 @@ Requires: %{name} = %{version}-%{release} %description plugin-profile-tv Plugin libraries for TV devices -%package plugin-profile-iot +%package plugin-profile-iot-headed Summary: Plugin libraries for IoT devices Group: System/Management Requires: %{name} = %{version}-%{release} -%description plugin-profile-iot +%description plugin-profile-iot-headed Plugin libraries for IoT devices %prep @@ -239,10 +239,10 @@ mv %{_sysconfdir}/deviced/tv-display.conf %{_sysconfdir}/deviced/display.conf mkdir -p %{_libdir}/deviced mv %{_libdir}/tv-display.so %{_libdir}/deviced/display.so -%post plugin-profile-iot -mv %{_sysconfdir}/deviced/iot-display.conf %{_sysconfdir}/deviced/display.conf +%post plugin-profile-iot-headed +mv %{_sysconfdir}/deviced/iot-headed-display.conf %{_sysconfdir}/deviced/display.conf mkdir -p %{_libdir}/deviced -mv %{_libdir}/iot-display.so %{_libdir}/deviced/display.so +mv %{_libdir}/iot-headed-display.so %{_libdir}/deviced/display.so %files %manifest %{name}.manifest @@ -346,11 +346,11 @@ mv %{_libdir}/iot-display.so %{_libdir}/deviced/display.so %{_unitdir}/rndis.service %{_bindir}/rndis.sh -%files plugin-profile-iot +%files plugin-profile-iot-headed %manifest deviced.manifest %license LICENSE.Apache-2.0 %defattr(-,root,root,-) -%config %{_sysconfdir}/deviced/iot-display.conf -%{_libdir}/iot-display.so +%config %{_sysconfdir}/deviced/iot-headed-display.conf +%{_libdir}/iot-headed-display.so %{_unitdir}/rndis.service %{_bindir}/rndis.sh diff --git a/plugins/iot/display/CMakeLists.txt b/plugins/iot-headed/display/CMakeLists.txt similarity index 95% rename from plugins/iot/display/CMakeLists.txt rename to plugins/iot-headed/display/CMakeLists.txt index bb28cc3..a57a502 100644 --- a/plugins/iot/display/CMakeLists.txt +++ b/plugins/iot-headed/display/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(iot-display C) +PROJECT(iot-headed-display C) FILE(GLOB ALL_SRCS "*.c") SET(SRCS ${ALL_SRCS}) @@ -28,5 +28,5 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_LIB_CFLAGS}") ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libpkgs_LDFLAGS} deviced-common-private) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "") -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME iot-display) +SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME iot-headed-display) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) diff --git a/plugins/iot/display/core.c b/plugins/iot-headed/display/core.c similarity index 100% rename from plugins/iot/display/core.c rename to plugins/iot-headed/display/core.c diff --git a/plugins/iot/display/device-interface.c b/plugins/iot-headed/display/device-interface.c similarity index 100% rename from plugins/iot/display/device-interface.c rename to plugins/iot-headed/display/device-interface.c diff --git a/plugins/iot/display/key-filter.c b/plugins/iot-headed/display/key-filter.c similarity index 100% rename from plugins/iot/display/key-filter.c rename to plugins/iot-headed/display/key-filter.c -- 2.7.4