Separate resource manager from runtime information

Change-Id: Ie2828ce341fe4bbd21740482c8fce056ed9a510c
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index f11e371de3b21bde143eabe2d87672cd9850c35d..a822507141add43028bf78b75071e1cf161a6328 100644 (file)
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -42,6 +42,7 @@ Source1306: domain-features-upgrade.inc
 Source1307: domain-features-tool_and_locale.inc
 Source1308: domain-features-recovery.inc
 Source1309: domain-features-setup.inc
+Source1310: domain-features-resource_manager.inc
 
 Source2010:    epicfeature-development.inc
 Source2020:    epicfeature-application.inc
@@ -317,6 +318,7 @@ python ./rule_checker.py
 %{include_if_mainbuild %{SOURCE1307}}
 %{include_if_mainbuild %{SOURCE1308}}
 %{include_if_mainbuild %{SOURCE1309}}
+%{include_if_mainbuild %{SOURCE1310}}
 
 ############## EPIC FEATURES ######################
 

diff --git a/packaging/domain-apis-system.inc b/packaging/domain-apis-system.inc
index 4c81b0f05eb435e0964a6662978a846685c0b38d..aac162740d880569480c377050e83b5d929c6c8c 100644 (file)
--- a/packaging/domain-apis-system.inc
+++ b/packaging/domain-apis-system.inc
@@ -15,9 +15,7 @@ Suggests: %{name}-sub2-domain_API-System-Device_IR
 Suggests: %{name}-sub2-domain_API-System-Device_Led
 Suggests: %{name}-sub2-domain_API-System-Device_Power
 Suggests: %{name}-sub2-domain_API-System-Feedback
-Suggests: %{name}-sub2-domain_API-System-Runtime_information
-Suggests: %{name}-sub2-domain_API-System-Runtime_information_Light
-Suggests: %{name}-sub2-domain_API-System-Runtime_information_Headless
+Suggests: %{name}-sub2-domain_API-System-Runtime_Information
 Suggests: %{name}-sub2-domain_API-System-Sensor_Listener
 Suggests: %{name}-sub2-domain_API-System-Sensor_Recorder
 Suggests: %{name}-sub2-domain_API-System-Storage
@@ -241,43 +239,13 @@ For example, svi-data-profile_common for common
              feedbackd-profile_mobile and svi-data-profile_mobile for mobile
 %files sub2-domain_API-System-Feedback
 
-%package sub2-domain_API-System-Runtime_information
-Summary:    Runtime information with Resourced
+%package sub2-domain_API-System-Runtime_Information
+Summary:    Runtime information
 Requires:   capi-system-runtime-info
-Requires:   resourced
-Conflicts:  %{name}-sub2-domain_API-System-Runtime_information_Light
-Conflicts:  %{name}-sub2-domain_API-System-Runtime_information_Headless
-%description sub2-domain_API-System-Runtime_information
+%description sub2-domain_API-System-Runtime_Information
 capi-system-runtime-info provides the current system state.<br>
-To get the process information, it needs resourced.<br>
-This building block uses full-featured resourced.
-%files sub2-domain_API-System-Runtime_information
-
-%package sub2-domain_API-System-Runtime_information_Light
-Summary:    Runtime information with Resourced-light
-Requires:   capi-system-runtime-info
-Requires:   resourced-light
-Conflicts:  %{name}-sub2-domain_API-System-Runtime_information
-Conflicts:  %{name}-sub2-domain_API-System-Runtime_information_Headless
-%description sub2-domain_API-System-Runtime_information_Light
-capi-system-runtime-info provides the current system state.<br>
-To get the process information, it needs resourced.<br>
-This building block uses light-weight resourced.
-%files sub2-domain_API-System-Runtime_information_Light
-
-%package sub2-domain_API-System-Runtime_information_Headless
-Summary:    Runtime information with Resourced-headless
-Requires:   capi-system-runtime-info
-Requires:   resourced-headless
-Requires:   resourced-headless-common
-Requires:   resourced-headless-proc-usage
-Conflicts:  %{name}-sub2-domain_API-System-Runtime_information
-Conflicts:  %{name}-sub2-domain_API-System-Runtime_information_Light
-%description sub2-domain_API-System-Runtime_information_Headless
-capi-system-runtime-info provides the current system state.<br>
-To get the process information, it needs resourced.<br>
-This building block uses the resourced for headless device.
-%files sub2-domain_API-System-Runtime_information_Headless
+To get the process information, it needs resource manager.
+%files sub2-domain_API-System-Runtime_Information
 
 %package sub2-domain_API-System-Sensor_Listener
 Summary:    Sensor_Listener

diff --git a/packaging/domain-features-resource_manager.inc b/packaging/domain-features-resource_manager.inc
new file mode 100644 (file)
index 0000000..06c0303
--- /dev/null
+++ b/packaging/domain-features-resource_manager.inc
@@ -0,0 +1,39 @@
+# Maintainer: TBD: This is temporary block for TDC Demo. You may proceed with this later anyway.
+# You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
+
+############################
+## Tizen Resource Manager ##
+############################
+%package sub1-domain_Feature-Resource_manager
+Summary:    Tizen Resource Manager - Full Featured
+Requires:   resourced
+Conflicts:  %{name}-sub1-domain_Feature-Resource_manager_Light
+Conflicts:  %{name}-sub1-domain_Feature-Resource_manager_Headless
+%description sub1-domain_Feature-Resource_manager
+Tizen block (set of packages) for supporting resource management.<br>
+Resourced is the full-featured resource manager daemon for headed devices.
+%files sub1-domain_Feature-Resource_manager
+
+%package sub1-domain_Feature-Resource_manager_Light
+Summary:    Tizen Resource Manager - Light-Weight
+Requires:   resourced-light
+Conflicts:  %{name}-sub1-domain_Feature-Resource_manager
+Conflicts:  %{name}-sub1-domain_Feature-Resource_manager_Headless
+%description sub1-domain_Feature-Resource_manager_Light
+Tizen block (set of packages) for supporting resource management.<br>
+Resourced-light is the light-weight resource manager daemon for headed devices.
+%files sub1-domain_Feature-Resource_manager_Light
+
+%package sub1-domain_Feature-Resource_manager_Headless
+Summary:    Tizen Resource Manager - For Headless Devices
+Requires:   resourced-headless
+Requires:   resourced-headless-common
+Requires:   resourced-headless-memory
+Requires:   resourced-headless-proc-usage
+Conflicts:  %{name}-sub1-domain_Feature-Resource_manager
+Conflicts:  %{name}-sub1-domain_Feature-Resource_manager_Light
+%description sub1-domain_Feature-Resource_manager_Headless
+Tizen block (set of packages) for supporting resource management.<br>
+Resourced-headless is the resource manager daemon for headless devices.
+%files sub1-domain_Feature-Resource_manager_Headless
+

diff --git a/packaging/domain-features.inc b/packaging/domain-features.inc
index 18e5ea95efc9d1fb5c727867103656d1d13a00d2..3ba2e46172c95275b05687c1a42b2208873a6078 100644 (file)
--- a/packaging/domain-features.inc
+++ b/packaging/domain-features.inc
@@ -12,6 +12,10 @@ Suggests:    %{name}-sub1-domain_Feature-Upgrade
 Suggests:      %{name}-sub1-domain_Feature-Recovery
 Suggests:      %{name}-sub1-domain_Feature-Setup
 Suggests:      %{name}-sub1-domain_Feature-Tool_And_Locale
+Suggests:   %{name}-sub1-domain_Feature-Resource_manager
+Suggests:   %{name}-sub1-domain_Feature-Resource_manager_Light
+Suggests:   %{name}-sub1-domain_Feature-Resource_manager_Headless
+
 %description root-domain_Feature
 __EXPAND__: domains
 Tizen Platform Internal Feature Sets

diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index bdac0fd74883a6c85fe713ecadfcac6aac5d7e42..80aed0e2d61f38c142d3c6c727a8f286ce61c6f3 100644 (file)
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -103,7 +103,7 @@ Requires:   %{name}-sub2-domain_API-Security-Device_Policy
 Requires:      %{name}-sub2-domain_API-Security-Privilege_Info
 Requires:      %{name}-sub2-domain_API-Security-YACA
 Requires:      %{name}-sub2-domain_API-System-Device_Callback
-Requires:      %{name}-sub2-domain_API-System-Runtime_information
+Requires:      %{name}-sub2-domain_API-System-Runtime_Information
 Requires:      %{name}-sub2-domain_API-System-Sensor_Listener
 Requires:      %{name}-sub2-domain_API-System-Storage
 Requires:      %{name}-sub2-domain_API-System-System_Settings