Revert "halapi: Add hal-api-manifest.xml"

This reverts commit 6204958d8715858d61de3d8b8f94a93e701b203b.

The hal-api-manifest.xml has been removed and it would be deployed to
each repository of hal api module instead. Although the commit has been
reverted, manifest scheme will follows description on that commit.

Change-Id: I5c2121b600ef0f3eccc122913dcf82e6e432a33f
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e55c0d210b1fcf44ee3c3334ac048fb6dcf18a21..be7e73329bee54ab190f71a9ae18a5c62bc3f535 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,6 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
        FILES_MATCHING PATTERN "*.h")
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/packaging/${PROJECT_NAME}.pc
        DESTINATION ${LIBDIR}/pkgconfig)
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/hal-manifest DESTINATION /etc)
 
 ADD_SUBDIRECTORY(tests)
 

diff --git a/hal-manifest/hal-api-manifest.xml b/hal-manifest/hal-api-manifest.xml
deleted file mode 100644 (file)
index 331df5a..0000000
--- a/hal-manifest/hal-api-manifest.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<manifest version="1.0" type="platform">
-    <hal>
-        <name>HAL_MODULE_TBM</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_TDM</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_AUDIO</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_CAMERA</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_RADIO</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_BLUETOOTH</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_WIFI</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_NFC</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_ZIGBEE</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_UWB</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_LOCATION</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_POWER</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_SENSOR</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_DEVICE_BATTERY</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_DEVICE_BEZEL</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_DEVICE_DISPLAY</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_DEVICE_IR</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_DEVICE_TOUCHSCREEN</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_DEVICE_LED</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_DEVICE_BOARD</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_DEVICE_EXTERNAL_CONNECTION</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_DEVICE_THERMAL</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_DEVICE_HAPTIC</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_DEVICE_MEMORY</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_DEVICE_INPUT</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-    <hal>
-        <name>HAL_MODULE_DEVICE_POWER</name>
-        <version>1.0</version>
-        <transport>passthrough</transport>
-    </hal>
-</manifest>

diff --git a/packaging/hal-api-common.spec b/packaging/hal-api-common.spec
index 187f0696eded541d65a4ed3b7c5d729054642104..9d8d7904d5de25d0e0afad1936e4efbaced52e2e 100644 (file)
--- a/packaging/hal-api-common.spec
+++ b/packaging/hal-api-common.spec
@@ -97,7 +97,6 @@ rm -rf %{buildroot}
 %{_bindir}/lshal
 %{_bindir}/hal-compatibility-checker
 %{_sysconfdir}/ld.so.conf.d/libhal-api.conf
-%{_sysconfdir}/hal-manifest
 %{_systemdgeneratordir}/systemd-hal-firmware-generator
 %{_systemdgeneratordir}/systemd-hal-compatibility-checker-generator