Combine deviced-PROFILE rpms into a unified onesubmit/tizen/20180212.102636accepted/tizen/unified/20180213.055916

Change-Id: If3de8f109d38c601f930d08c227e9a04781abe44
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

8 files changed, 35 insertions, 196 deletions

diff --git a/build_test_img/test_set/TC0028_artik530_bb_list.txt b/build_test_img/test_set/TC0028_artik530_bb_list.txt
index 7ff0573..5371e15 100644
--- a/build_test_img/test_set/TC0028_artik530_bb_list.txt
+++ b/build_test_img/test_set/TC0028_artik530_bb_list.txt
@@ -8,5 +8,5 @@ building-blocks-sub1-Preset_partition-3parts_ramdisk_recovery
 building-blocks-sub2-domain_API-AppFramework-TPK_Installation
 
 # Device
-building-blocks-sub2-domain_API-System-Device_Callback
+building-blocks-sub2-domain_API-System-Device
 building-blocks-sub2-Preset_boards-ARTIK530-System_Device
diff --git a/mapping-bb-rs.xml b/mapping-bb-rs.xml
index 38d73ca..4b1a720 100644
--- a/mapping-bb-rs.xml
+++ b/mapping-bb-rs.xml
@@ -368,27 +368,12 @@
 	<buildingblock name="building-blocks-sub2-domain_API-Social-Phonenumber_utils">
 		<rs_info>phonenumber-utils-rs.xml</rs_info>
 	</buildingblock>
-	<buildingblock name="building-blocks-sub2-domain_API-System-Device_Battery">
-		<rs_info>capi-system-device-rs.xml</rs_info>
-	</buildingblock>
-	<buildingblock name="building-blocks-sub2-domain_API-System-Device_Callback">
-		<rs_info>capi-system-device-rs.xml</rs_info>
-	</buildingblock>
-	<buildingblock name="building-blocks-sub2-domain_API-System-Device_Display">
+	<buildingblock name="building-blocks-sub2-domain_API-System-Device">
 		<rs_info>capi-system-device-rs.xml</rs_info>
 	</buildingblock>
 	<buildingblock name="building-blocks-sub2-domain_API-System-Device_Haptic">
 		<rs_info>capi-system-device-rs.xml</rs_info>
 	</buildingblock>
-	<buildingblock name="building-blocks-sub2-domain_API-System-Device_IR">
-		<rs_info>capi-system-device-rs.xml</rs_info>
-	</buildingblock>
-	<buildingblock name="building-blocks-sub2-domain_API-System-Device_Led">
-		<rs_info>capi-system-device-rs.xml</rs_info>
-	</buildingblock>
-	<buildingblock name="building-blocks-sub2-domain_API-System-Device_Power">
-		<rs_info>capi-system-device-rs.xml</rs_info>
-	</buildingblock>
 	<buildingblock name="building-blocks-sub2-domain_API-System-Feedback">
 		<rs_info>libfeedback-rs.xml</rs_info>
 	</buildingblock>
diff --git a/mapping-bb-tct.xml b/mapping-bb-tct.xml
index 98a29a7..81b352a 100644
--- a/mapping-bb-tct.xml
+++ b/mapping-bb-tct.xml
@@ -292,9 +292,7 @@
 		<tct_info>tct-device-native-ctc</tct_info>
 		<tct_info>tct-device-native-itc</tct_info>
 		<tct_info>tct-device-native-utc</tct_info>
-		<bb_info>building-blocks-sub2-domain_API-System-Device_Callback</bb_info>
-		<bb_info>building-blocks-sub2-domain_API-System-Device_Display</bb_info>
-		<bb_info>building-blocks-sub2-domain_API-System-Device_Power</bb_info>
+		<bb_info>building-blocks-sub2-domain_API-System-Device</bb_info>
 	</imageid>
 	<imageid name="TC0029">
 		<tct_info>tct-runtime-info-native-itc</tct_info>
diff --git a/packaging/domain-apis-appfw.inc b/packaging/domain-apis-appfw.inc
index c846977..f54747d 100644
--- a/packaging/domain-apis-appfw.inc
+++ b/packaging/domain-apis-appfw.inc
@@ -154,7 +154,7 @@ Requires: attach-panel-document
 Requires: attach-panel-voicerecorder
 
 Requires: %{name}-sub2-domain_API-Multimedia-Camera
-Requires: %{name}-sub2-domain_API-System-Device_Battery
+Requires: %{name}-sub2-domain_API-System-Device
 Requires: %{name}-sub2-domain_API-Multimedia-Recorder
 Requires: %{name}-sub2-domain_API-AppFramework-Native_EFL_UI_app_model
 Requires: %{name}-sub2-domain_API-System-Storage
diff --git a/packaging/domain-apis-system.inc b/packaging/domain-apis-system.inc
index 811edbc..33f320e 100644
--- a/packaging/domain-apis-system.inc
+++ b/packaging/domain-apis-system.inc
@@ -7,13 +7,8 @@
 ############
 %package sub1-domain_API-System
 Summary:	System API Group
-Suggests: %{name}-sub2-domain_API-System-Device_Battery
-Suggests: %{name}-sub2-domain_API-System-Device_Callback
-Suggests: %{name}-sub2-domain_API-System-Device_Display
+Suggests: %{name}-sub2-domain_API-System-Device
 Suggests: %{name}-sub2-domain_API-System-Device_Haptic
-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
@@ -30,14 +25,10 @@ Suggests: %{name}-sub2-domain_API-System-dlog
 Tizen block (set of packages) for Group of domain API-System
 %files sub1-domain_API-System
 
-%package sub2-domain_API-System-Device_Battery
-Summary:    Device_Battery
+%package sub2-domain_API-System-Device
+Summary:  Device
 Requires: deviced
 Requires: capi-system-device
-Suggests: deviced-profile_mobile
-Suggests: deviced-profile_common
-Suggests: deviced-profile_wearable
-Suggests: deviced-profile_tv
 Suggests: device-manager-plugin-sc7730
 Suggests: device-manager-plugin-artik
 Suggests: device-manager-plugin-emul
@@ -46,75 +37,19 @@ Suggests: device-manager-plugin-exynos5433
 Suggests: device-manager-plugin-exynos7270
 Suggests: device-manager-plugin-odroid
 Suggests: device-manager-plugin-rpi3
-%description sub2-domain_API-System-Device_Battery
-Tizen block (set of packages) for Group of sub domain Device_Battery.
-If you do not want to use Device_Battery APIs, you do not need to choose.
-However, if you want to use them, you have to choose at least one item in each deviced-profile_xxxx and device-manager-plugin-xxxx.
-Those have a dependancy on Profile and Hardware.
-So, before you select, you have to make sure that which Profile and hardware you have.
+%description sub2-domain_API-System-Device
+Tizen block (set of packages) for Group of sub domain Device.
+If you do not want to use Device APIs, you do not need to choose.
+However, if you want to use them, you have to choose at least one item in each device-manager-plugin-xxxx.
+Those have a dependancy on Hardware.
+So, before you select, you have to make sure that which hardware you have.
 Then choose proper combination.
-For example, deviced-profile_mobile and device-manager-plugin-sc7730 for mobile
-             deviced-profile_common and device-manager-plugin-rpi3 for rpi3
-%files sub2-domain_API-System-Device_Battery
-%posttrans sub2-domain_API-System-Device_Battery
-%tizen_feature tizen.org/feature/battery true
-
-%package sub2-domain_API-System-Device_Callback
-Summary:    Device_Callback
-Requires: deviced
-Requires: capi-system-device
-Suggests: deviced-profile_mobile
-Suggests: deviced-profile_common
-Suggests: deviced-profile_wearable
-Suggests: deviced-profile_tv
-Suggests: device-manager-plugin-sc7730
-Suggests: device-manager-plugin-artik
-Suggests: device-manager-plugin-emul
-Suggests: device-manager-plugin-exynos3250
-Suggests: device-manager-plugin-exynos5433
-Suggests: device-manager-plugin-exynos7270
-Suggests: device-manager-plugin-odroid
-Suggests: device-manager-plugin-rpi3
-%description sub2-domain_API-System-Device_Callback
-Tizen block (set of packages) for Group of sub domain Device_Callback.
-If you do not want to use Device_Callback APIs, you do not need to choose.
-However, if you want to use them, you have to choose at least one item in each deviced-profile_xxxx and device-manager-plugin-xxxx.
-Those have a dependancy on Profile and Hardware.
-So, before you select, you have to make sure that which Profile and hardware you have.
-Then choose proper combination.
-For example, deviced-profile_mobile and device-manager-plugin-sc7730 for mobile
-             deviced-profile_common and device-manager-plugin-rpi3 for rpi3
-%files sub2-domain_API-System-Device_Callback
-
-%package sub2-domain_API-System-Device_Display
-Summary:  Device_Display
-Requires: deviced
-Requires: capi-system-device
-Suggests: deviced-profile_mobile
-Suggests: deviced-profile_common
-Suggests: deviced-profile_wearable
-Suggests: deviced-profile_tv
-Suggests: device-manager-plugin-sc7730
-Suggests: device-manager-plugin-artik
-Suggests: device-manager-plugin-emul
-Suggests: device-manager-plugin-exynos3250
-Suggests: device-manager-plugin-exynos5433
-Suggests: device-manager-plugin-exynos7270
-Suggests: device-manager-plugin-odroid
-Suggests: device-manager-plugin-rpi3
-%description sub2-domain_API-System-Device_Display
-Tizen block (set of packages) for Group of sub domain Device_Display.
-If you do not want to use Device_Display APIs, you do not need to choose.
-However, if you want to use them, you have to choose at least one item in each deviced-profile_xxxx and device-manager-plugin-xxxx.
-Those have a dependancy on Profile and Hardware.
-So, before you select, you have to make sure that which Profile and hardware you have.
-Then choose proper combination.
-For example, deviced-profile_mobile and device-manager-plugin-sc7730 for mobile
-             deviced-profile_common and device-manager-plugin-rpi3 for rpi3
-%files sub2-domain_API-System-Device_Display
+For example, device-manager-plugin-sc7730 for mobile
+             device-manager-plugin-rpi3 for rpi3
+%files sub2-domain_API-System-Device
 
 %package sub2-domain_API-System-Device_Haptic
-Summary:    Device_Haptic
+Summary:  Device_Haptic
 Requires: feedbackd
 Requires: capi-system-device
 Suggests: feedbackd-driver-external
@@ -133,92 +68,8 @@ Then choose proper one.
 For example, feedbackd-driver-circle for tw1
 %files sub2-domain_API-System-Device_Haptic
 
-%package sub2-domain_API-System-Device_IR
-Summary:    Device_IR
-Requires: deviced
-Requires: capi-system-device
-Suggests: deviced-profile_mobile
-Suggests: deviced-profile_common
-Suggests: deviced-profile_wearable
-Suggests: deviced-profile_tv
-Suggests: device-manager-plugin-sc7730
-Suggests: device-manager-plugin-artik
-Suggests: device-manager-plugin-emul
-Suggests: device-manager-plugin-exynos3250
-Suggests: device-manager-plugin-exynos5433
-Suggests: device-manager-plugin-exynos7270
-Suggests: device-manager-plugin-odroid
-Suggests: device-manager-plugin-rpi3
-%description sub2-domain_API-System-Device_IR
-Tizen block (set of packages) for Group of sub domain Device_IR.
-If you do not want to use Device_IR APIs, you do not need to choose.
-However, if you want to use them, you have to choose at least one item in each deviced-profile_xxxx and device-manager-plugin-xxxx.
-Those have a dependancy on Profile and Hardware.
-So, before you select, you have to make sure that which Profile and hardware you have.
-Then choose proper combination.
-For example, deviced-profile_mobile and device-manager-plugin-sc7730 for mobile
-             deviced-profile_common and device-manager-plugin-rpi3 for rpi3
-%files sub2-domain_API-System-Device_IR
-%posttrans sub2-domain_API-System-Device_IR
-%tizen_feature tizen.org/feature/consumer_ir true
-
-%package sub2-domain_API-System-Device_Led
-Summary:    Device_Led
-Requires: deviced
-Requires: capi-system-device
-Suggests: deviced-profile_mobile
-Suggests: deviced-profile_common
-Suggests: deviced-profile_wearable
-Suggests: deviced-profile_tv
-Suggests: device-manager-plugin-sc7730
-Suggests: device-manager-plugin-artik
-Suggests: device-manager-plugin-emul
-Suggests: device-manager-plugin-exynos3250
-Suggests: device-manager-plugin-exynos5433
-Suggests: device-manager-plugin-exynos7270
-Suggests: device-manager-plugin-odroid
-Suggests: device-manager-plugin-rpi3
-%description sub2-domain_API-System-Device_Led
-Tizen block (set of packages) for Group of sub domain Device_Led.
-If you do not want to use Device_Led APIs, you do not need to choose.
-However, if you want to use them, you have to choose at least one item in each deviced-profile_xxxx and device-manager-plugin-xxxx.
-Those have a dependancy on Profile and Hardware.
-So, before you select, you have to make sure that which Profile and hardware you have.
-Then choose proper combination.
-For example, deviced-profile_mobile and device-manager-plugin-sc7730 for mobile
-             deviced-profile_common and device-manager-plugin-rpi3 for rpi3
-%files sub2-domain_API-System-Device_Led
-%posttrans sub2-domain_API-System-Device_Led
-%tizen_feature tizen.org/feature/led true
-
-%package sub2-domain_API-System-Device_Power
-Summary:    Device_Power
-Requires: deviced
-Requires: capi-system-device
-Suggests: deviced-profile_mobile
-Suggests: deviced-profile_common
-Suggests: deviced-profile_wearable
-Suggests: deviced-profile_tv
-Suggests: device-manager-plugin-sc7730
-Suggests: device-manager-plugin-artik
-Suggests: device-manager-plugin-emul
-Suggests: device-manager-plugin-exynos3250
-Suggests: device-manager-plugin-exynos5433
-Suggests: device-manager-plugin-exynos7270
-Suggests: device-manager-plugin-odroid
-Suggests: device-manager-plugin-rpi3
-%description sub2-domain_API-System-Device_Power
-If you do not want to use Device_Power APIs, you do not need to choose.
-However, if you want to use them, you have to choose at least one item in each deviced-profile_xxxx and device-manager-plugin-xxxx.
-Those have a dependancy on Profile and Hardware.
-So, before you select, you have to make sure that which Profile and hardware you have
-Then choose proper combination.
-For example, deviced-profile_mobile and device-manager-plugin-sc7730 for mobile
-             deviced-profile_common and device-manager-plugin-rpi3 for rpi3
-%files sub2-domain_API-System-Device_Power
-
 %package sub2-domain_API-System-Feedback
-Summary:    Feedback
+Summary:  Feedback
 Requires: %{name}-sub2-domain_API-Multimedia-Audio_IO
 Requires: feedbackd
 Requires: libfeedback
@@ -336,7 +187,6 @@ System setting api for get,set configuration
 %tizen_feature tizen.org/feature/systemsetting true
 %tizen_feature tizen.org/feature/systemsetting.notification_email true
 
-
 %package sub2-domain_API-System-T_Trace
 Summary:    T_Trace
 Requires: ttrace
@@ -362,5 +212,3 @@ Requires: dlogutil
 %description sub2-domain_API-System-dlog
 Tizen block (set of packages) for Group of sub domain dlog
 %files sub2-domain_API-System-dlog
-
-
diff --git a/packaging/platform-preset-boards-tm1.inc b/packaging/platform-preset-boards-tm1.inc
index cbb7acf..a558b92 100644
--- a/packaging/platform-preset-boards-tm1.inc
+++ b/packaging/platform-preset-boards-tm1.inc
@@ -7,6 +7,7 @@
 %package sub1-Preset_boards-TM1
 Summary:	TM1 Selection for HAL and Feature
 Requires:	%{name}-sub2-Preset_boards-TM1-System
+Requires:	%{name}-sub2-Preset_boards-TM1-System_Device
 Suggests:	%{name}-sub2-Preset_boards-TM1-Audio
 Suggests:	%{name}-sub2-Preset_boards-TM1-Audio_Recording
 Suggests:	%{name}-sub2-Preset_boards-TM1-GPS
@@ -72,6 +73,17 @@ Requires:	model-config-tm1
 Packages for System HAL and Feature. They are mandatory.
 %files sub2-Preset_boards-TM1-System
 
+### TM1-System_Device ###
+%package sub2-Preset_boards-TM1-System_Device
+Summary:        TM1_Deviced Plugin
+Requires:       device-manager-plugin-sc7730
+
+%description sub2-Preset_boards-TM1-System_Device
+Packages for Deviced HAL and Feature.
+%files sub2-Preset_boards-TM1-System_Device
+%posttrans sub2-Preset_boards-TM1-System_Device
+%tizen_feature tizen.org/feature/battery true
+%tizen_feature tizen.org/feature/led true
 
 ### TM1-Audio ###
 %package sub2-Preset_boards-TM1-Audio
diff --git a/packaging/platform-preset-boards-tm2.inc b/packaging/platform-preset-boards-tm2.inc
index 5e89c21..9e4eea3 100644
--- a/packaging/platform-preset-boards-tm2.inc
+++ b/packaging/platform-preset-boards-tm2.inc
@@ -69,7 +69,6 @@ Firstly select HALs and Feature to add to your image.
 %tizen_feature tizen.org/feature/peripheral_io.uart true
 %tizen_feature tizen.org/system/model_name tm2
 
-
 ### TM2-System ###
 %package sub2-Preset_boards-TM2-System
 Summary:	TM2_System
@@ -80,7 +79,6 @@ Requires:	model-config-default
 Requires:	system-plugin-init_wrapper
 #Requires:	system-plugin-n4
 
-
 %description sub2-Preset_boards-TM2-System
 Packages for System HAL and Feature. They are mandatory.
 If you select 3 partitions, please select system-plugin-u3.
@@ -95,7 +93,10 @@ Requires:	device-manager-plugin-exynos5433
 %description sub2-Preset_boards-TM2-System_Device
 Packages for Deviced HAL and Feature.
 %files sub2-Preset_boards-TM2-System_Device
-
+%posttrans sub2-Preset_boards-TM2-System_Device
+%tizen_feature tizen.org/feature/battery true
+%tizen_feature tizen.org/feature/led true
+%tizen_feature tizen.org/feature/consumer_ir true
 
 ### TM2-Audio ###
 %package sub2-Preset_boards-TM2-Audio
@@ -188,7 +189,6 @@ Packages of Camera HAL and Feature for TM2.
 %tizen_feature tizen.org/feature/camera.front.flash false
 %tizen_feature tizen.org/feature/media.video_recording true
 
-
 ### TM2-Display ###
 %package sub2-Preset_boards-TM2-Display
 Summary:	TM2_Display
@@ -252,7 +252,6 @@ Packages of Wifi HAL and Feature for TM2.
 If you enable the UI, you can select net-config-plugin-headed.
 %files sub2-Preset_boards-TM2-Wifi
 
-
 ### TM2-WifiDirect ###
 %package sub2-Preset_boards-TM2-WifiDirect
 Summary:	TM2_WifiDirect
@@ -292,7 +291,6 @@ Requires:	bluetooth-agent-profile_common
 Packages of Bluetooth HAL and Feature for TM2.
 %files sub2-Preset_boards-TM2-Bluetooth_CallAudio
 
-
 ### TM2-BLE ###
 %package sub2-Preset_boards-TM2-BLE
 Summary:	TM2_BLE
@@ -332,7 +330,6 @@ Requires:	%{name}-sub2-Preset_boards-TM2-Audio
 Requires:	feedbackd-profile_mobile
 Requires:	svi-data-profile_common
 
-
 %description sub2-Preset_boards-TM2-Feedback
 Packages of Feedback HAL and Feature for TM2.
 %files sub2-Preset_boards-TM2-Feedback
@@ -370,7 +367,6 @@ Requires:	efl-theme-tizen-common
 Requires:   elementary-tizen
 Suggests:   download-fonts-service
 
-
 %description sub2-Preset_boards-TM2-EFL
 Packages of EFL HAL and Feature for TM2.
 %files sub2-Preset_boards-TM2-EFL
diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index f3e605b..489901d 100644
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -103,7 +103,7 @@ Requires:	%{name}-sub2-domain_API-Security-CSR
 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-Device
 Requires:	%{name}-sub2-domain_API-System-Runtime_information
 Requires:	%{name}-sub2-domain_API-System-Sensor_Listener
 Requires:	%{name}-sub2-domain_API-System-Storage