Remove wifi Building-block

Change-Id: Icaaa2ca4cd9d7f5337dccd3bf0ea4c91eda6dc6e
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>

diff --git a/mapping-bb-rs.xml b/mapping-bb-rs.xml
index 397c3549435029b272293d9a48960674630e5739..72c88b1d6fa6f73a22cadaf4438fb9c5ac1604d3 100644 (file)
--- a/mapping-bb-rs.xml
+++ b/mapping-bb-rs.xml
@@ -12,7 +12,6 @@
                <rs_info>capi-base-common-rs.xml</rs_info>
                <rs_info>capi-network-connection-rs.xml</rs_info>
                <rs_info>capi-network-wifi-manager-rs.xml</rs_info>
-               <rs_info>capi-network-wifi-rs.xml</rs_info>
                <rs_info>capi-system-info-rs.xml</rs_info>
                <rs_info>capi-system-peripheral-io-rs.xml</rs_info>
                <rs_info>ecore-rs.xml</rs_info>
@@ -336,9 +335,6 @@
        <buildingblock name="building-blocks-sub2-domain_API-Network-VPN_Service">
                <rs_info>capi-vpn-service-rs.xml</rs_info>
        </buildingblock>
-       <buildingblock name="building-blocks-sub2-domain_API-Network-WiFi">
-               <rs_info>capi-network-wifi-rs.xml</rs_info>
-       </buildingblock>
        <buildingblock name="building-blocks-sub2-domain_API-Network-WiFi_Direct">
                <rs_info>capi-network-wifi-direct-rs.xml</rs_info>
        </buildingblock>

diff --git a/mapping-bb-tct.xml b/mapping-bb-tct.xml
index db5c47e1ea1ab9379f5b8b9621a6d0ac6d57c269..a6283c56bfedb6933e076cb72b211d0c3f8d7ec1 100644 (file)
--- a/mapping-bb-tct.xml
+++ b/mapping-bb-tct.xml
@@ -22,8 +22,6 @@
                <tct_info>tct-system-info-native-utc</tct_info>
                <tct_info>tct-ttrace-native-itc</tct_info>
                <tct_info>tct-trace-native-utc</tct_info>
-               <tct_info>tct-wifi-native-itc</tct_info>
-               <tct_info>tct-wifi-native-utc</tct_info>
                <tct_info>tct-wifi-manager-native-itc</tct_info>
                <tct_info>tct-wifi-manager-native-utc</tct_info>
                <bb_info>building-blocks-root-Preset_iot_core</bb_info>

diff --git a/packaging/domain-apis-account.inc b/packaging/domain-apis-account.inc
index 5444b8f74f641178b7e7d3f88de0c8f959a2d214..f249e168d65b7c1c3d1208610b721dd0ec408010 100644 (file)
--- a/packaging/domain-apis-account.inc
+++ b/packaging/domain-apis-account.inc
@@ -65,7 +65,7 @@ Requires:     libcore-sync-client
 Requires:      %{name}-sub2-domain_API-Account-Account_Manager
 Requires:      %{name}-sub2-domain_API-Social-Contacts
 Suggests:      %{name}-sub1-domain_API-Telephony
-Suggests:      %{name}-sub2-domain_API-Network-WiFi
+Suggests:      %{name}-sub2-domain_API-Network-WiFi_Manager
 %description sub2-domain_API-Account-Sync_Manager
 This block supports managing data synchronization. Also, to use this feature, either Data Network or Wi-Fi connection is required. Once you check the Sync Manager before Image Creation, it will be included the image.
 %files sub2-domain_API-Account-Sync_Manager

diff --git a/packaging/domain-apis-content.inc b/packaging/domain-apis-content.inc
index ad26e19c3962181bf875115a7211834b5c15b667..7777bedaa10e4592888d87b779e634f9afbaa5b5 100644 (file)
--- a/packaging/domain-apis-content.inc
+++ b/packaging/domain-apis-content.inc
@@ -17,7 +17,6 @@ Tizen block (set of packages) for Group of domain API-Content
 Summary:    Download
 Requires:      capi-web-url-download
 Requires:      download-provider
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 Suggests:      %{name}-sub1-domain_API-Telephony
 %description sub2-domain_API-Content-Download

diff --git a/packaging/domain-apis-messaging.inc b/packaging/domain-apis-messaging.inc
index 03c41ce2743c2bdd3905aceea37b0f53d9406d9b..a5b66ad38e9a3fe963fc0233071a2bb483561c2c 100644 (file)
--- a/packaging/domain-apis-messaging.inc
+++ b/packaging/domain-apis-messaging.inc
@@ -19,7 +19,7 @@ Summary:Email
 Requires:capi-messaging-email
 Requires:email-service
 Suggests:%{name}-sub1-domain_API-Telephony
-Suggests:%{name}-sub2-domain_API-Network-WiFi
+Suggests:%{name}-sub2-domain_API-Network-WiFi_Manager
 
 %description sub2-domain_API-Messaging-Email
 This block supports managing Email service.<br>
@@ -54,7 +54,7 @@ This block supports managing Message service.
 Summary:       Push Client
 Requires:      libpush
 Suggests:      %{name}-sub1-domain_API-Telephony
-Suggests:      %{name}-sub2-domain_API-Network-WiFi
+Suggests:      %{name}-sub2-domain_API-Network-WiFi_Manager
 %description sub2-domain_API-Messaging-Push
 This block supports transferation push messages between devices and server. Also, to use this feature, either Data Network or Wi-Fi connection is required. Once you check the Push Client before Image Creation, it will be included the image. For this, either Data Network or Wi-Fi connection is required.
 %files sub2-domain_API-Messaging-Push

diff --git a/packaging/domain-apis-multimedia.inc b/packaging/domain-apis-multimedia.inc
index 969598a7706d303a48937556520c4319a28a0fa6..c1431dbb23befc905d890f208825490d2abe8408 100644 (file)
--- a/packaging/domain-apis-multimedia.inc
+++ b/packaging/domain-apis-multimedia.inc
@@ -142,7 +142,7 @@ Requires: %{name}-sub2-domain_API-Multimedia-Configuration
 Requires: %{name}-sub2-domain_API-System-Storage
 Requires: %{name}-sub2-domain_API-UI-TBM_Surface
 Requires: %{name}-sub2-domain_API-UI-EFL_NativeUIToolkit
-Requires: %{name}-sub2-domain_API-Network-WiFi
+Requires: %{name}-sub2-domain_API-Network-WiFi_Manager
 
 %description sub2-domain_API-Multimedia-Media_Streamer
 This block supports constructing the custom player and it gives the ability to controlling playback attributes.<br>
@@ -255,7 +255,7 @@ Requires: %{name}-sub2-domain_API-System-Storage
 Requires: %{name}-sub2-domain_API-UI-TBM_Surface
 
 # suggest building block for network streaming
-Suggests: %{name}-sub2-domain_API-Network-WiFi
+Suggests: %{name}-sub2-domain_API-Network-WiFi_Manager
 
 # suggest building block for video rendering
 Suggests: capi-media-player-display

diff --git a/packaging/domain-apis-network.inc b/packaging/domain-apis-network.inc
index 98f8af7f851eb38c0b1a56ead4274d3121b3ce3b..b12929f67b532e3e3698be5e91164610c48329c1 100644 (file)
--- a/packaging/domain-apis-network.inc
+++ b/packaging/domain-apis-network.inc
@@ -24,7 +24,6 @@ Suggests: %{name}-sub2-domain_API-Network-SSDP
 Suggests: %{name}-sub2-domain_API-Network-STC
 Suggests: %{name}-sub2-domain_API-Network-Smartcard
 Suggests: %{name}-sub2-domain_API-Network-VPN_Service
-Suggests: %{name}-sub2-domain_API-Network-WiFi
 Suggests: %{name}-sub2-domain_API-Network-WiFi_Manager
 Suggests: %{name}-sub2-domain_API-Network-WiFi_Direct
 %description sub1-domain_API-Network
@@ -243,7 +242,6 @@ and you need the package either DNSSD or WiFi Direct. A default is DNSSD.
 %package sub2-domain_API-Network-Connection
 Summary:    Connection
 Requires:      capi-network-connection
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 Suggests:      %{name}-sub1-domain_API-Telephony
 %description sub2-domain_API-Network-Connection
@@ -254,7 +252,6 @@ To use this feature, either Data Network or Wi-Fi connection is required. <br>
 %package sub2-domain_API-Network-Curl
 Summary:    Curl
 Requires:      libcurl
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 Suggests:      %{name}-sub1-domain_API-Telephony
 %description sub2-domain_API-Network-Curl
@@ -266,7 +263,6 @@ To use this feature, either Data Network or Wi-Fi connection is required. <br>
 Summary:    DNS-SD
 Requires:      libnsd-dns-sd
 Requires:      mdnsresponder
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 Suggests:      %{name}-sub1-domain_API-Telephony
 %description sub2-domain_API-Network-DNSSD
@@ -279,7 +275,6 @@ To use this feature, either Data Network or Wi-Fi connection is required. <br>
 %package sub2-domain_API-Network-HTTP
 Summary:    HTTP
 Requires:      capi-network-http
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 Suggests:      %{name}-sub1-domain_API-Telephony
 %description sub2-domain_API-Network-HTTP
@@ -290,7 +285,7 @@ To use this feature, either Data Network or Wi-Fi connection is required. <br>
 %package sub2-domain_API-Network-IoTCon
 Summary:    IoTCon
 Requires: iotcon
-Requires: %{name}-sub2-domain_API-Network-WiFi
+Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 %description sub2-domain_API-Network-IoTCon
 This block supports Tizen IoT Connectivity Service & Library(Client) based on Iotivity. <br>
 It supports resource management, remote resource management, CRUDN request/response and resource representation. <br>
@@ -324,7 +319,6 @@ Enabling NFC Manager and it is possible to user NFC API
 %package sub2-domain_API-Network-SSDP
 Summary:    SSDP
 Requires:      libnsd-ssdp
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 Suggests:      %{name}-sub1-domain_API-Telephony
 %description sub2-domain_API-Network-SSDP
@@ -338,7 +332,6 @@ To use this feature, either Data Network or Wi-Fi connection is required. <br>
 Summary:    STC
 Requires:      capi-network-stc
 Requires:      stc-manager
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 Suggests:      %{name}-sub1-domain_API-Telephony
 %description sub2-domain_API-Network-STC
@@ -371,7 +364,6 @@ In case of embedded SE, 'smartcard-plugin-nfc' and 'sub2-domain_API-Network-NFC'
 Summary:    VPN_Service
 Requires:      capi-vpnsvc
 #Requires:     net-config
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 %description sub2-domain_API-Network-VPN_Service
 Tizen block (set of packages) for API sets of domain API-Network-VPN_Service <br>
@@ -380,44 +372,6 @@ To use this feature, either Data Network or Wi-Fi connection is required. <br>
 %posttrans sub2-domain_API-Network-VPN_Service
 %tizen_feature tizen.org/feature/network.vpn true
 
-%package sub2-domain_API-Network-WiFi
-Summary:    WiFi
-Requires:      capi-network-wifi
-Requires:      net-config
-Requires:      connman
-Requires:      wpa_supplicant
-
-#Profiles
-Suggests:      wpa_supplicant-extension-TM1
-Suggests:      wpa_supplicant-extension-TM2
-Suggests:      wpa_supplicant-profile_common
-Suggests:      wpa_supplicant-profile_tv
-Suggests:      net-config-profile_tv
-Suggests:      net-config-profile_wearable
-Suggests:      connman-extension-ivi
-Suggests:      connman-extension-tv
-
-#Headed/Headless
-Suggests:      net-config-plugin-headed
-
-%description sub2-domain_API-Network-WiFi
-Tizen block (set of packages) for API sets of domain API-Network-WiFi <br>
-TM1 target (headed setting UI) : wpa_supplicant-extension-TM1, net-config-plugin-headed <br>
-TM1 target (headless) : wpa_supplicant-extension-TM1 <br>
-TM2 target (headed settgin UI) : wpa_supplicant-extension-TM2, net-config-plugin-headed <br>
-TM2 target (headless) : wpa_supplicant-extension-TM2 <br>
-TW1 target (headed setting UI) : wpa_supplicant-profile_common, net-config-plugin-headed <br>
-TW1 target (headless) : wpa_supplicant-profile_common <br>
-TW2 target (headed setting UI) : wpa_supplicant-profile_common, net-config-profile_wearable, net-config-plugin-headed <br>
-TW2 target (headless): wpa_supplicant-profile_common, net-config-profile_wearable <br>
-wearable profile : wpa_supplicant-profile_common, net-config-profile_wearable <br>
-tv profile : wpa_supplicant-profile_common, wpa_supplicant-profile_tv, net-config-profile_tv, connman-extension-tv <br>
-ivi profile : wpa_supplicant-profile_common, connman-extension-ivi <br>
-common profile : wpa_supplicant-profile_common <br>
-%files sub2-domain_API-Network-WiFi
-%posttrans sub2-domain_API-Network-WiFi
-%tizen_feature tizen.org/feature/network.wifi true
-
 %package sub2-domain_API-Network-WiFi_Manager
 Summary:    WiFi_Manager
 Requires:      capi-network-wifi-manager
@@ -461,7 +415,6 @@ Summary:    WiFi_Direct
 Requires:      capi-network-wifi-direct
 Requires:      wifi-direct-manager
 Requires:      wifi-direct-plugin-wpasupplicant
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 
 #Profiles

diff --git a/packaging/platform-preset-boards-artik530.inc b/packaging/platform-preset-boards-artik530.inc
index ad7083f08086aeacc2eaf725e0d54ad874e4e65e..bf9e9f368247fadbdb495f940830b15bc420858b 100755 (executable)
--- a/packaging/platform-preset-boards-artik530.inc
+++ b/packaging/platform-preset-boards-artik530.inc
@@ -235,7 +235,6 @@ Packages of Display HAL and Feature for ARTIK530(Headless).
 ### ARTIK530-Wifi ###
 %package sub2-Preset_boards-ARTIK530-Wifi
 Summary:       ARTIK530_Wifi
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 Requires:      wpa_supplicant-profile_common
 Suggests:      net-config-plugin-headed

diff --git a/packaging/platform-preset-boards-rpi3.inc b/packaging/platform-preset-boards-rpi3.inc
index 97c939a67c25834293061f68ac674ea89025debf..67bf5d6a7814bf9ba2b74bf36f40ae0b510b203a 100755 (executable)
--- a/packaging/platform-preset-boards-rpi3.inc
+++ b/packaging/platform-preset-boards-rpi3.inc
@@ -234,7 +234,6 @@ Packages of Display HAL and Feature for RPI3(Headless).
 ### RPI3-Wifi ###
 %package sub2-Preset_boards-RPI3-Wifi
 Summary:       RPI3_Wifi
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 Requires:      wpa_supplicant-profile_common
 Suggests:      net-config-plugin-headed

diff --git a/packaging/platform-preset-boards-tm1.inc b/packaging/platform-preset-boards-tm1.inc
index 2af8965261966dc3cfe706bcf5cafba341f10482..68ae7ef4b48933aba7fcbbf536d282a0587d4f45 100755 (executable)
--- a/packaging/platform-preset-boards-tm1.inc
+++ b/packaging/platform-preset-boards-tm1.inc
@@ -196,7 +196,6 @@ Packages of Display HAL and Feature for TM1.
 ### TM1-Wifi ###
 %package sub2-Preset_boards-TM1-Wifi
 Summary:       TM1_Wifi
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 Requires:      wpa_supplicant-extension-TM1
 Suggests:      net-config-plugin-headed

diff --git a/packaging/platform-preset-boards-tm2.inc b/packaging/platform-preset-boards-tm2.inc
index 6b5953c2273f89fd54ecdb88ba569969deac5de7..0f9ddaafb023ff6cfd5fefa6d24aa39138fa218c 100755 (executable)
--- a/packaging/platform-preset-boards-tm2.inc
+++ b/packaging/platform-preset-boards-tm2.inc
@@ -242,7 +242,6 @@ Packages of Display HAL and Feature for TM2(Headless).
 ### TM2-Wifi ###
 %package sub2-Preset_boards-TM2-Wifi
 Summary:       TM2_Wifi
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 Requires:      wpa_supplicant-extension-TM2
 Suggests:      net-config-plugin-headed

diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index 489901ded7386420ea9f3892850ce7a6bf044373..1c64520ca84d450688d5641e63794a1b7d7dbcbb 100644 (file)
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -16,7 +16,6 @@ Requires: capi-appfw-app-common
 Requires: capi-appfw-app-manager
 Requires: capi-appfw-package-manager
 Requires: capi-appfw-preference
-Requires: capi-network-wifi
 Requires: capi-network-wifi-manager
 Requires: capi-system-peripheral-io
 Requires: connman
@@ -97,7 +96,6 @@ Requires:     %{name}-sub2-domain_API-Network-Bluetooth_Transfer
 Requires:      %{name}-sub2-domain_API-Network-DNSSD
 Requires:      %{name}-sub2-domain_API-Network-MTP
 Requires:      %{name}-sub2-domain_API-Network-SSDP
-Requires:      %{name}-sub2-domain_API-Network-WiFi
 Requires:      %{name}-sub2-domain_API-Network-WiFi_Manager
 Requires:      %{name}-sub2-domain_API-Security-CSR
 Requires:      %{name}-sub2-domain_API-Security-Device_Policy