diff options
author | Woo Chang Kim <wchang.kim@samsung.com> | 2021-04-20 01:14:54 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@review> | 2021-04-20 01:14:54 +0000 |
commit | 597d5a6a0674db1483723e1b2846ff0289a6dfd4 (patch) | |
tree | 0bd9422c98ec401299f669a2f6d5328b1fd80a80 | |
parent | f15b71e39e0ce8e2b17c4b085109ec1229aaadf9 (diff) | |
parent | 565ae80ba59265b278374f4338867e1f50f5b6dc (diff) | |
download | building-blocks-accepted/tizen_5.5_unified.tar.gz building-blocks-accepted/tizen_5.5_unified.tar.bz2 building-blocks-accepted/tizen_5.5_unified.zip |
Merge "[TRE-2682] Add softap to IoT platform image" into tizen_5.5submit/tizen_5.5/20210420.013353accepted/tizen/5.5/unified/20210420.024303tizen_5.5accepted/tizen_5.5_unified
-rw-r--r-- | packaging/platform-preset-iot-headed-images.inc | 4 | ||||
-rw-r--r-- | packaging/platform-preset-iot-headless-images.inc | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc index d275206..28c5abf 100644 --- a/packaging/platform-preset-iot-headed-images.inc +++ b/packaging/platform-preset-iot-headed-images.inc @@ -114,6 +114,8 @@ Requires: inference-engine-opencv Requires: inference-engine-tflite #From TRE-2277 Requires: askuser-notification +#From TRE-2682 +Requires: %{name}-sub2-domain_API-Network-SoftAP Conflicts: %{name}-sub1-Preset_img_headed-rpi3 @@ -235,6 +237,8 @@ Requires: inference-engine-tflite Requires: askuser-notification #From TRE-2397 Requires: %{name}-sub2-Preset_boards-RPI3-Feedback +#From TRE-2682 +Requires: %{name}-sub2-domain_API-Network-SoftAP Conflicts: %{name}-sub1-Preset_img_headed-artik530 Conflicts: %{name}-sub1-Preset_img_headless-artik530 diff --git a/packaging/platform-preset-iot-headless-images.inc b/packaging/platform-preset-iot-headless-images.inc index c553ec2..6cf3256 100644 --- a/packaging/platform-preset-iot-headless-images.inc +++ b/packaging/platform-preset-iot-headless-images.inc @@ -60,6 +60,8 @@ Requires: %{name}-sub1-domain_Feature-Resource_manager_Headless Requires: %{name}-sub2-domain_API-System-Runtime_Information #From TRE-2290 Requires: capi-network-tethering +#From TRE-2682 +Requires: %{name}-sub2-domain_API-Network-SoftAP Conflicts: %{name}-sub1-Preset_img_headed-rpi3 Conflicts: %{name}-sub1-Preset_img_headed-artik530 @@ -122,8 +124,8 @@ Requires: stability-monitor-kmod-rpi3 Requires: stability-monitor #From TRE-2290 Requires: capi-network-tethering - - +#From TRE-2682 +Requires: %{name}-sub2-domain_API-Network-SoftAP Conflicts: %{name}-sub1-Preset_img_headed-rpi3 Conflicts: %{name}-sub1-Preset_img_headed-artik530 |