From: Kichan Kwon <k_c.kwon@samsung.com>
Date: Thu, 20 Sep 2018 02:47:02 +0000 (+0900)
Subject: Update TC image for runtime information
X-Git-Tag: submit/tizen/20180920.035613^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26d2286d60dd4f61efc9524f59f370db5b5aade3;p=tools%2Fbuilding-blocks.git

Update TC image for runtime information

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

diff --git a/build_test_img/test_set/TC0029_artik530_bb_list.txt b/build_test_img/test_set/TC0029_artik530_bb_list.txt
index 5a9ea40..e464220 100644
--- a/build_test_img/test_set/TC0029_artik530_bb_list.txt
+++ b/build_test_img/test_set/TC0029_artik530_bb_list.txt
@@ -8,4 +8,7 @@ building-blocks-sub1-Preset_partition-3parts_ramdisk_recovery
 building-blocks-sub2-domain_API-AppFramework-TPK_Installation
 
 # Runtime Info
-building-blocks-sub2-domain_API-System-Runtime_information
+building-blocks-sub2-domain_API-System-Runtime_Information
+
+# Resource Manager
+building-blocks-sub1-domain_Feature-Resource_manager
diff --git a/build_test_img/test_set/TC0030_artik530_bb_list.txt b/build_test_img/test_set/TC0030_artik530_bb_list.txt
index 09a53fe..cc02204 100644
--- a/build_test_img/test_set/TC0030_artik530_bb_list.txt
+++ b/build_test_img/test_set/TC0030_artik530_bb_list.txt
@@ -7,5 +7,8 @@ building-blocks-sub1-Preset_partition-3parts_ramdisk_recovery
 # For TCT
 building-blocks-sub2-domain_API-AppFramework-TPK_Installation
 
-# Runtime Info headless
-building-blocks-sub2-domain_API-System-Runtime_information_Headless
+# Runtime Info
+building-blocks-sub2-domain_API-System-Runtime_Information
+
+# Resourced Headless
+building-blocks-sub1-domain_Feature-Resource_manager_Headless
diff --git a/build_test_img/test_set/TC0031_artik530_bb_list.txt b/build_test_img/test_set/TC0031_artik530_bb_list.txt
index dd17174..e715d5d 100644
--- a/build_test_img/test_set/TC0031_artik530_bb_list.txt
+++ b/build_test_img/test_set/TC0031_artik530_bb_list.txt
@@ -7,6 +7,8 @@ building-blocks-sub1-Preset_partition-3parts_ramdisk_recovery
 # For TCT
 building-blocks-sub2-domain_API-AppFramework-TPK_Installation
 
-# Runtime Info light
-building-blocks-sub2-domain_API-System-Runtime_information_Light
+# Runtime Info
+building-blocks-sub2-domain_API-System-Runtime_Information
 
+# Light-weight Resource Manager
+building-blocks-sub1-domain_Feature-Resource_manager_Light
diff --git a/mapping-bb-rs.xml b/mapping-bb-rs.xml
index 703f91b..a8fd971 100644
--- a/mapping-bb-rs.xml
+++ b/mapping-bb-rs.xml
@@ -387,13 +387,7 @@
 	<buildingblock name="building-blocks-sub2-domain_API-System-Feedback">
 		<rs_info>libfeedback-rs.xml</rs_info>
 	</buildingblock>
-	<buildingblock name="building-blocks-sub2-domain_API-System-Runtime_information">
-		<rs_info>capi-system-runtime-info-rs.xml</rs_info>
-	</buildingblock>
-	<buildingblock name="building-blocks-sub2-domain_API-System-Runtime_information_Headless">
-		<rs_info>capi-system-runtime-info-rs.xml</rs_info>
-	</buildingblock>
-	<buildingblock name="building-blocks-sub2-domain_API-System-Runtime_information_Light">
+	<buildingblock name="building-blocks-sub2-domain_API-System-Runtime_Information">
 		<rs_info>capi-system-runtime-info-rs.xml</rs_info>
 	</buildingblock>
 	<buildingblock name="building-blocks-sub2-domain_API-System-Sensor_Listener">
diff --git a/mapping-bb-tct.xml b/mapping-bb-tct.xml
index 5323650..18e479c 100644
--- a/mapping-bb-tct.xml
+++ b/mapping-bb-tct.xml
@@ -330,19 +330,19 @@
 		<tct_info>tct-runtime-info-native-ctc</tct_info>
 		<tct_info>tct-runtime-info-native-itc</tct_info>
 		<tct_info>tct-runtime-info-native-utc</tct_info>
-		<bb_info>building-blocks-sub2-domain_API-System-Runtime_information</bb_info>
+		<bb_info>building-blocks-sub2-domain_API-System-Runtime_Information</bb_info>
 	</imageid>
 	<imageid name="TC0030">
 		<tct_info>tct-runtime-info-native-ctc</tct_info>
 		<tct_info>tct-runtime-info-native-itc</tct_info>
 		<tct_info>tct-runtime-info-native-utc</tct_info>
-		<bb_info>building-blocks-sub2-domain_API-System-Runtime_information_Headless</bb_info>
+		<bb_info>building-blocks-sub2-domain_API-System-Runtime_Information</bb_info>
 	</imageid>
 	<imageid name="TC0031">
 		<tct_info>tct-runtime-info-native-ctc</tct_info>
 		<tct_info>tct-runtime-info-native-itc</tct_info>
 		<tct_info>tct-runtime-info-native-utc</tct_info>
-		<bb_info>building-blocks-sub2-domain_API-System-Runtime_information_Light</bb_info>
+		<bb_info>building-blocks-sub2-domain_API-System-Runtime_Information</bb_info>
 	</imageid>
 	<imageid name="TC0032">
 		<tct_info>tct-sensor-native-ctc</tct_info>
diff --git a/packaging/domain-features-resource_manager.inc b/packaging/domain-features-resource_manager.inc
index 06c0303..935ef43 100644
--- a/packaging/domain-features-resource_manager.inc
+++ b/packaging/domain-features-resource_manager.inc
@@ -29,6 +29,7 @@ Summary:    Tizen Resource Manager - For Headless Devices
 Requires:   resourced-headless
 Requires:   resourced-headless-common
 Requires:   resourced-headless-memory
+Requires:   resourced-headless-proc-manager
 Requires:   resourced-headless-proc-usage
 Conflicts:  %{name}-sub1-domain_Feature-Resource_manager
 Conflicts:  %{name}-sub1-domain_Feature-Resource_manager_Light
diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index faf51b8..5187a7e 100644
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -180,6 +180,7 @@ Requires:	%{name}-sub2-domain_API-UIX-TTS
 Requires:	%{name}-sub2-domain_API-UIX-Voice_control
 Requires:	%{name}-sub2-domain_API-UIX-Voice_control_elementary
 Requires:	%{name}-sub2-domain_API-Web-WebView
+Requires:	%{name}-sub1-domain_Feature-Resource_manager
 
 %description root-Preset_iot_headed
 The packages of Tizen IoT Headed Common.