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 5a9ea407964311eb8e7e23a51c63c2023b79efaf..e4642202ec343432b844cde60318cd83d449b0fe 100644 (file)
--- 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 09a53fe9fbac635f64392b38b51cfe70c6b3b3e7..cc02204fef37598c7bb1f8cd4ac286a0be3cd96e 100644 (file)
--- 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 dd17174c41358520795a0ac8212e266068e390ab..e715d5dd6f0c4ddfb2c0ef60019e71b41f96ca6d 100644 (file)
--- 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 703f91bc286aa5dbc67fbacb830cfe4964bb46f8..a8fd971c0f455d953fdf45126943e3ba1489b31f 100644 (file)
--- 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 5323650c91a554847eeb1dbf580e934011608606..18e479c5922c073aad612bede6690db6d62bb21b 100644 (file)
--- 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 06c03036c37a2ecdbbb5b63372484087a9bb71d3..935ef432f0554cd7fe12d8fe95050375ad1d6cab 100644 (file)
--- 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 faf51b8f9524f80796e3682a79f73d06b3d208b5..5187a7e6e376fd438118f83bd7fa317565194d6b 100644 (file)
--- 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.