From: Kichan Kwon Date: Wed, 13 Dec 2017 10:48:40 +0000 (+0900) Subject: Separate resource manager from runtime information X-Git-Tag: submit/tizen/20180920.035613~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f77c21b4dd98a4321e3491527ccd1114d50b9a6f;p=tools%2Fbuilding-blocks.git Separate resource manager from runtime information Change-Id: Ie2828ce341fe4bbd21740482c8fce056ed9a510c Signed-off-by: Kichan Kwon --- diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec index 54cf581..23b44d0 100644 --- 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 @@ -318,6 +319,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 eed09e9..6b22a46 100644 --- a/packaging/domain-apis-system.inc +++ b/packaging/domain-apis-system.inc @@ -10,9 +10,7 @@ Summary: System API Group Suggests: %{name}-sub2-domain_API-System-Device Suggests: %{name}-sub2-domain_API-System-Device_Haptic 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 @@ -90,43 +88,19 @@ Then choose proper combination. For example, svi-data-profile_common for common %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 +Suggests: %{name}-sub1-domain_Feature-Resource_manager +Suggests: %{name}-sub1-domain_Feature-Resource_manager_Light +Suggests: %{name}-sub1-domain_Feature-Resource_manager_Headless +%description sub2-domain_API-System-Runtime_Information capi-system-runtime-info provides the current system state.
-To get the process information, it needs resourced.
-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.
-To get the process information, it needs resourced.
-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.
-To get the process information, it needs resourced.
-This building block uses the resourced for headless device. -%files sub2-domain_API-System-Runtime_information_Headless +To get the process information, you need to add one of these resource manager features below;
+ * Tizen Resource Manager - Full Featured
+ * Tizen Resource Manager - For Headless Devices
+ * Tizen Resource Manager - Light-Weight +%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 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.
+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.
+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.
+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 6500cd8..480db43 100644 --- a/packaging/domain-features.inc +++ b/packaging/domain-features.inc @@ -11,7 +11,11 @@ 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 Suggests: %{name}-sub1-domain_Feature-Smartthings_App + %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 48bc913..faf51b8 100644 --- a/packaging/platform-preset-iot.inc +++ b/packaging/platform-preset-iot.inc @@ -151,7 +151,7 @@ Requires: %{name}-sub2-domain_API-Social-Calendar Requires: %{name}-sub2-domain_API-Social-Contacts Requires: %{name}-sub2-domain_API-Social-Phonenumber_utils Requires: %{name}-sub2-domain_API-System-Device -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-Sensor_Recorder Requires: %{name}-sub2-domain_API-System-Storage