Adding new feature for Smartthings app.

Change-Id: Ief41383b0218316a2a00cb9859314f0d7cdbad97

diff --git a/mapping-bb-rs.xml b/mapping-bb-rs.xml
index 987db734c0783e1fb61021346f12a017f5ed34de..5c926a979542c2b3c4c2af106387473764b0dbbe 100644 (file)
--- a/mapping-bb-rs.xml
+++ b/mapping-bb-rs.xml
@@ -516,4 +516,7 @@
        <buildingblock name="building-blocks-sub2-domain_API-Web-json_Glib">
                <rs_info>json-glib-rs.xml</rs_info>
        </buildingblock>
+       <buildingblock name="building-blocks-sub1-domain_Feature-Smartthings_App">
+               <rs_info>smartthings-rs.xml</rs_info>
+       </buildingblock>
 </MappingInfo>

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index bcf448d5d588853e70828e0c4ac4927dc6adff58..54cf58141d150059b6126063e892189dafa9636c 100644 (file)
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -35,7 +35,7 @@ Source1217:   domain-apis-web.inc
 Source1300: domain-features.inc
 Source1301: domain-features-dotnet.inc
 Source1302: domain-features-webapi.inc
-Source1303: domain-features-softap.inc
+Source1303: domain-features-smartthings.inc
 Source1304: domain-features-bootanimation.inc
 Source1305: domain-features-starter.inc
 Source1306: domain-features-upgrade.inc

diff --git a/packaging/domain-features-smartthings.inc b/packaging/domain-features-smartthings.inc
new file mode 100644 (file)
index 0000000..de8f486
--- /dev/null
+++ b/packaging/domain-features-smartthings.inc
@@ -0,0 +1,14 @@
+# 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.
+
+############
+## SoftAP ##
+############
+%package sub1-domain_Feature-Smartthings_App
+Summary:       Smartthing App support packages
+Requires: building-blocks-sub2-domain_API-Network-SoftAP
+Requires: building-blocks-sub2-domain_API-AppFramework-Alarm_API
+Requires: building-blocks-sub2-domain_API-Security-Device_Certificate
+%description sub1-domain_Feature-Smartthings_App
+Tizen block (set of packages) for supporting to make Smartthings_app
+%files sub1-domain_Feature-Smartthings_App

diff --git a/packaging/domain-features-softap.inc b/packaging/domain-features-softap.inc
deleted file mode 100644 (file)
index 4a0de63..0000000
--- a/packaging/domain-features-softap.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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.
-
-############
-## SoftAP ##
-############
-%package sub1-domain_Feature-SoftAP
-Summary:       SoftAP feature packages
-Requires: capi-network-softap
-Requires: dnsmasq
-Requires: iproute2
-Requires: mobileap-agent
-%description sub1-domain_Feature-SoftAP
-Tizen block (set of packages) for supporting soft AP
-%files sub1-domain_Feature-SoftAP

diff --git a/packaging/domain-features.inc b/packaging/domain-features.inc
index 18e5ea95efc9d1fb5c727867103656d1d13a00d2..6500cd8b68b1060c3ee0d53f53f7b372f7c99702 100644 (file)
--- a/packaging/domain-features.inc
+++ b/packaging/domain-features.inc
@@ -3,7 +3,6 @@
 
 %package root-domain_Feature
 Summary:       Tizen Platform Internal Feature Sets
-Suggests:      %{name}-sub1-domain_Feature-SoftAP
 Suggests:      %{name}-sub1-domain_Feature-DotNET
 Suggests:      %{name}-sub1-domain_Feature-WebAPI
 Suggests:      %{name}-sub1-domain_Feature-BootAni
@@ -12,6 +11,7 @@ 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-Smartthings_App
 %description root-domain_Feature
 __EXPAND__: domains
 Tizen Platform Internal Feature Sets

diff --git a/packaging/platform-preset-boards-artik530.inc b/packaging/platform-preset-boards-artik530.inc
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/packaging/platform-preset-boards-rpi3.inc b/packaging/platform-preset-boards-rpi3.inc
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/packaging/platform-preset-boards-tm1.inc b/packaging/platform-preset-boards-tm1.inc
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/packaging/platform-preset-boards-tm2.inc b/packaging/platform-preset-boards-tm2.inc
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc
index 9d38b9dc7cbbfbcee366a8cabbff46e10490a9c7..de029baa7532958e313449ab61e43ea034dd1092 100644 (file)
--- a/packaging/platform-preset-iot-headed-images.inc
+++ b/packaging/platform-preset-iot-headed-images.inc
@@ -53,10 +53,10 @@ Requires:   %{name}-sub2-Preset_boards-ARTIK530-WifiDirect
 ## Partition
 Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 ## Feature
+Requires:      %{name}-sub1-domain_Feature-Smartthings_App
 Requires:      %{name}-sub1-domain_Feature-BootAni
 Requires:      %{name}-sub1-domain_Feature-DotNET
 Requires:      dali-csharp-binder
-Requires:      %{name}-sub1-domain_Feature-SoftAP
 Requires:      %{name}-sub1-domain_Feature-Starter
 Requires:      %{name}-sub1-domain_Feature-Upgrade
 Requires:      %{name}-sub1-domain_Feature-WebAPI
@@ -122,10 +122,10 @@ Requires: %{name}-sub2-Preset_boards-RPI3-WifiDirect
 ## Partition
 Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 ## Feature
+Requires:      %{name}-sub1-domain_Feature-Smartthings_App
 Requires:      %{name}-sub1-domain_Feature-BootAni
 Requires:      %{name}-sub1-domain_Feature-DotNET
 Requires:      dali-csharp-binder
-Requires:      %{name}-sub2-domain_API-Network-SoftAP
 Requires:      %{name}-sub1-domain_Feature-Starter
 Requires:      %{name}-sub1-domain_Feature-Upgrade
 Requires:      %{name}-sub1-domain_Feature-Recovery

diff --git a/packaging/platform-preset-iot-headless-images.inc b/packaging/platform-preset-iot-headless-images.inc
index b55de1cb0ac99a5371c17fe15ddd3ddf003844ad..617c1b2d025f5d83415af154ce117acd07e22337 100644 (file)
--- a/packaging/platform-preset-iot-headless-images.inc
+++ b/packaging/platform-preset-iot-headless-images.inc
@@ -28,13 +28,12 @@ Requires:   %{name}-sub2-Preset_boards-ARTIK530-BLE
 Requires:      %{name}-sub2-Preset_boards-ARTIK530-Display_Headless
 Requires:      %{name}-sub2-Preset_boards-ARTIK530-Wifi
 Requires:      %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
-Requires:      %{name}-sub2-domain_API-AppFramework-Alarm_API
 Requires:      %{name}-sub2-domain_API-AppFramework-TPK_Installation
 Requires:      %{name}-sub2-domain_API-Base-Utils
 Requires:      %{name}-sub2-domain_API-Multimedia-Player
 Requires:      %{name}-sub2-domain_API-Network-Bluetooth_Media_Audio
 Requires:      %{name}-sub2-domain_API-Network-Curl
-Requires:      %{name}-sub1-domain_Feature-SoftAP
+Requires:   %{name}-sub1-domain_Feature-Smartthings_App
 Requires:      %{name}-sub1-domain_Feature-Setup
 Requires:      tar
 Requires:       system-plugin-config-env-headless
@@ -60,13 +59,12 @@ Requires:   %{name}-sub2-Preset_boards-RPI3-BLE
 Requires:      %{name}-sub2-Preset_boards-RPI3-Display_Headless
 Requires:      %{name}-sub2-Preset_boards-RPI3-Wifi
 Requires:      %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
-Requires:      %{name}-sub2-domain_API-AppFramework-Alarm_API
 Requires:      %{name}-sub2-domain_API-AppFramework-TPK_Installation
 Requires:      %{name}-sub2-domain_API-Base-Utils
 Requires:      %{name}-sub2-domain_API-Multimedia-Player
 Requires:      %{name}-sub2-domain_API-Network-Bluetooth_Media_Audio
 Requires:      %{name}-sub2-domain_API-Network-Curl
-Requires:      %{name}-sub2-domain_API-Network-SoftAP
+Requires:   %{name}-sub1-domain_Feature-Smartthings_App
 Requires:      %{name}-sub1-domain_Feature-Setup
 Requires:      tar
 Requires:       system-plugin-config-env-headless