diff options
author | Hongkuk Son <hongkuk.son@samsung.com> | 2021-04-08 15:40:57 +0900 |
---|---|---|
committer | Dongchul Lim <dc7.lim@samsung.com> | 2021-04-30 02:04:36 +0000 |
commit | aa284f489188e7a83fcc6cabfcd70f7b99ba9cf4 (patch) | |
tree | aefaff5dadedd88d016e8fe93fb1662694771e9e | |
parent | d7cfb102bd465468ef9db1c69a0601a6a29c98fb (diff) | |
download | building-blocks-tizen_6.0_hotfix.tar.gz building-blocks-tizen_6.0_hotfix.tar.bz2 building-blocks-tizen_6.0_hotfix.zip |
[TRE-2673] Remove smartthings-thing-servicesubmit/tizen_6.0_hotfix/20210430.201750accepted/tizen/6.0/unified/hotfix/20210430.023202tizen_6.0_hotfixaccepted/tizen_6.0_unified_hotfix
Change-Id: I113ead8ffa3bac94820de09a4ee1a50579310b3f
Signed-off-by: Hongkuk Son <hongkuk.son@samsung.com>
(cherry picked from commit 91e00acc8603642e1a74858879783bf64dda31d5)
-rw-r--r-- | mapping-bb-rs.xml | 3 | ||||
-rw-r--r-- | packaging/building-blocks.spec | 6 | ||||
-rw-r--r-- | packaging/domain-features-smartthings.inc | 19 | ||||
-rw-r--r-- | packaging/domain-features.inc | 3 | ||||
-rw-r--r-- | packaging/platform-preset-iot-headed-images.inc | 6 | ||||
-rw-r--r-- | packaging/platform-preset-iot-headless-images.inc | 8 |
6 files changed, 0 insertions, 45 deletions
diff --git a/mapping-bb-rs.xml b/mapping-bb-rs.xml index f7b0245..b06f241 100644 --- 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 9b12e23..06615a0 100644 --- 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 @@ -347,9 +344,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 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 5a909a1..bdb3323 100644 --- 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 f6ba70e..b955d94 100644 --- a/packaging/platform-preset-iot-headed-images.inc +++ b/packaging/platform-preset-iot-headed-images.inc @@ -57,9 +57,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 @@ -206,9 +203,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 4c600fb..0b85021 100644 --- a/packaging/platform-preset-iot-headless-images.inc +++ b/packaging/platform-preset-iot-headless-images.inc @@ -44,10 +44,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 @@ -98,10 +94,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 |