diff options
| author | Woo Chang Kim <wchang.kim@samsung.com> | 2021-04-20 01:14:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review> | 2021-04-20 01:14:00 +0000 |
| commit | 4a8a1cf830b3278a0bcaab8363eaa250c500a20e (patch) | |
| tree | 2a57d31eae7e2d7200d4692532480e67998646fe | |
| parent | 5864acfb9dc4ee204a014b6c76817dafc19f971c (diff) | |
| parent | 1b6090797f8cc8f9a90d64de03fece5dd14b949d (diff) | |
| download | building-blocks-accepted/tizen_5.0_unified.tar.gz building-blocks-accepted/tizen_5.0_unified.tar.bz2 building-blocks-accepted/tizen_5.0_unified.zip | |
Merge "[TRE-2682] Add softap to IoT platform image" into tizen_5.0submit/tizen_5.0/20210420.013333accepted/tizen/5.0/unified/20210420.024303tizen_5.0accepted/tizen_5.0_unified
| -rw-r--r-- | packaging/platform-preset-iot-headed-images.inc | 4 | ||||
| -rw-r--r-- | packaging/platform-preset-iot-headless-images.inc | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc index 22f17e4..ce7b017 100644 --- a/packaging/platform-preset-iot-headed-images.inc +++ b/packaging/platform-preset-iot-headed-images.inc @@ -72,6 +72,8 @@ Requires: tizen-locale Requires: org.tizen.setting-profile_common Requires: ug-bluetooth-efl Requires: wifi-efl-ug +#From TRE-2682 +Requires: %{name}-sub2-domain_API-Network-SoftAP Conflicts: %{name}-sub1-Preset_img_headed-rpi3 Conflicts: %{name}-sub1-Preset_img_headless-artik530 @@ -141,6 +143,8 @@ Requires: tizen-locale Requires: org.tizen.setting-profile_common Requires: ug-bluetooth-efl Requires: wifi-efl-ug +#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 c4ad06e..99818e0 100644 --- a/packaging/platform-preset-iot-headless-images.inc +++ b/packaging/platform-preset-iot-headless-images.inc @@ -39,8 +39,10 @@ Requires: %{name}-sub2-domain_API-Network-Bluetooth_Media_Audio Requires: %{name}-sub2-domain_API-Network-Curl Requires: %{name}-sub1-domain_Feature-Setup Requires: tar -Requires: system-plugin-config-env-headless -Requires: bluez-plugin-headless +Requires: system-plugin-config-env-headless +Requires: bluez-plugin-headless +#From TRE-2682 +Requires: %{name}-sub2-domain_API-Network-SoftAP Conflicts: %{name}-sub1-Preset_img_headed-rpi3 Conflicts: %{name}-sub1-Preset_img_headed-artik530 @@ -74,8 +76,10 @@ Requires: %{name}-sub2-domain_API-Network-Bluetooth_Media_Audio Requires: %{name}-sub2-domain_API-Network-Curl Requires: %{name}-sub1-domain_Feature-Setup Requires: tar -Requires: system-plugin-config-env-headless -Requires: bluez-plugin-headless +Requires: system-plugin-config-env-headless +Requires: bluez-plugin-headless +#From TRE-2682 +Requires: %{name}-sub2-domain_API-Network-SoftAP Conflicts: %{name}-sub1-Preset_img_headed-rpi3 Conflicts: %{name}-sub1-Preset_img_headed-artik530 |