[TRE-2673] Remove smartthings-thing-service

Change-Id: I598c54135b73b75d43b0cbea4c6fe590519950f4
Signed-off-by: Hongkuk Son <hongkuk.son@samsung.com>

diff --git a/mapping-bb-rs.xml b/mapping-bb-rs.xml
index f7b02453d9227cf91c759c5076e82a44cd7f8959..b06f2416ccb3a7e487f43ab70cb48dd9cbcfc0fb 100644 (file)
--- a/mapping-bb-rs.xml
+++ b/mapping-bb-rs.xml
@@ -524,9 +524,6 @@
        <buildingblock name="building-blocks-sub2-domain_API-Web-json_Glib" abb_id="140">
                <rs_info>json-glib-rs.xml</rs_info>
        </buildingblock>
-       <buildingblock name="building-blocks-sub1-domain_Feature-Smartthings_App" abb_id="141">
-               <rs_info>smartthings-rs.xml</rs_info>
-       </buildingblock>
        <buildingblock name="building-blocks-sub2-domain_API-MachineLearning-NNTrainer" abb_id="142">
                <rs_info>capi-machine-learning-training-rs.xml</rs_info>
        </buildingblock>

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index 85512099ef33972d0e9657bed81759871cb27382..ea039e0290eaf6d9e4be1daf24dec6aae1f39740 100644 (file)
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -38,9 +38,6 @@ Source1218:   domain-apis-machinelearning.inc
 Source1300: domain-features.inc
 Source1301: domain-features-dotnet.inc
 Source1302: domain-features-webapi.inc
-%ifarch armv7l
-Source1303: domain-features-smartthings.inc
-%endif
 Source1304: domain-features-bootanimation.inc
 Source1305: domain-features-starter.inc
 Source1306: domain-features-upgrade.inc
@@ -358,9 +355,6 @@ python ./rule_checker.py
 %{include_if_mainbuild %{SOURCE1300}}
 %{include_if_mainbuild %{SOURCE1301}}
 %{include_if_mainbuild %{SOURCE1302}}
-%ifarch armv7l
-%{include_if_mainbuild %{SOURCE1303}}
-%endif
 %{include_if_mainbuild %{SOURCE1304}}
 %{include_if_mainbuild %{SOURCE1305}}
 %{include_if_mainbuild %{SOURCE1306}}

diff --git a/packaging/domain-features-smartthings.inc b/packaging/domain-features-smartthings.inc
deleted file mode 100644 (file)
index f25629c..0000000
--- a/packaging/domain-features-smartthings.inc
+++ /dev/null
@@ -1,19 +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.
-
-%ifarch armv7l
-#################
-## Smartthings ##
-#################
-%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
-Requires: building-blocks-sub2-domain_API-AppFramework-Message_Port_API
-Requires: building-blocks-sub2-domain_API-AppFramework-RPC_Port_API
-Requires: smartthings-thing-service
-%description sub1-domain_Feature-Smartthings_App
-Tizen block (set of packages) for supporting to make Smartthings_app
-%files sub1-domain_Feature-Smartthings_App
-%endif

diff --git a/packaging/domain-features.inc b/packaging/domain-features.inc
index 5a909a1c58261b004c786cb8ca390e7c1df28370..bdb3323d956f544eea36cf1b78cc91184e8b7293 100644 (file)
--- a/packaging/domain-features.inc
+++ b/packaging/domain-features.inc
@@ -17,9 +17,6 @@ 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
-%ifarch armv7l
-Suggests:      %{name}-sub1-domain_Feature-Smartthings_App
-%endif
 Suggests:      %{name}-sub1-domain_Feature-Power_manager
 Suggests:      %{name}-sub1-domain_Feature-Mode_Supervisor
 

diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc
index 0d192fe27b3a5db378f61e982c87e37b16e3791b..6848f970d2aa2526f1a4f810a86d71e97fef927d 100644 (file)
--- a/packaging/platform-preset-iot-headed-images.inc
+++ b/packaging/platform-preset-iot-headed-images.inc
@@ -65,9 +65,6 @@ Requires:     %{name}-sub2-Preset_boards-ARTIK530-WifiDirect
 ## Partition
 Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 ## Feature
-%ifarch armv7l
-Requires:      %{name}-sub1-domain_Feature-Smartthings_App
-%endif
 Requires:      %{name}-sub1-domain_Feature-BootAni
 %if %{dotnet_feature} == "on"
 Requires:      %{name}-sub1-domain_Feature-DotNET
@@ -214,9 +211,6 @@ Requires:   %{name}-sub2-Preset_boards-RPI3-WifiDirect
 ## Partition
 Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 ## Feature
-%ifarch armv7l
-Requires:      %{name}-sub1-domain_Feature-Smartthings_App
-%endif
 Requires:      %{name}-sub1-domain_Feature-BootAni
 %if %{dotnet_feature} == "on"
 Requires:      %{name}-sub1-domain_Feature-DotNET

diff --git a/packaging/platform-preset-iot-headless-images.inc b/packaging/platform-preset-iot-headless-images.inc
index ab1b18a2c49ec0f8cb01867b26cc50fac6629dea..c4a5b2f8aace89960c3a55a11dddd82b0eb3f4cd 100644 (file)
--- a/packaging/platform-preset-iot-headless-images.inc
+++ b/packaging/platform-preset-iot-headless-images.inc
@@ -49,10 +49,6 @@ Requires:       %{name}-sub1-domain_Feature-Diagnostics
 Requires:   %{name}-sub1-domain_Feature-Recovery
 #From TRE-2142
 Requires:   %{name}-sub1-domain_Feature-Setup
-#From TRE-1998
-%ifarch armv7l
-Requires:   %{name}-sub1-domain_Feature-Smartthings_App
-%endif
 #From TRE-1991
 Requires:   system-plugin-config-env-headless
 #From TRE-1994
@@ -110,10 +106,6 @@ Requires:   bluez-plugin-headless
 Requires:   %{name}-sub1-domain_Feature-Recovery
 #From TRE-2142
 Requires:   %{name}-sub1-domain_Feature-Setup
-#From TRE-1998
-%ifarch armv7l
-Requires:   %{name}-sub1-domain_Feature-Smartthings_App
-%endif
 Requires:   reboot-param-helper
 #From TRE-1991
 Requires:   system-plugin-config-env-headless