Remove legacy p2p_supp.conf file

Description: Most of P2PDevice related parameters are initialized by
__ws_init_p2pdevice and __ws_set_config_methods. And default configuration
file is provided by wpa_supplicant. We no longer need this file.
If more changes are needed, We need to think about adding parameters or
changed wpa_supplicant default configuration file.

Change-Id: I848230f6cb76eec51957ee34bab7c80d7233c108
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
index 8819f5e..84dea98 100644 (file)
--- a/files/CMakeLists.txt
+++ b/files/CMakeLists.txt
@@ -18,7 +18,6 @@
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/files/dhcpd-notify.sh.in ${CMAKE_SOURCE_DIR}/files/dhcpd-notify.sh @ONLY)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/files/dhcpd.conf.in ${CMAKE_SOURCE_DIR}/files/dhcpd.conf @ONLY)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/files/wifi-direct-manager.conf.in ${CMAKE_SOURCE_DIR}/files/wifi-direct-manager.conf @ONLY)
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/files/p2p_supp.conf.in ${CMAKE_SOURCE_DIR}/files/p2p_supp.conf @ONLY)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/files/p2p_supp.sh.in ${CMAKE_SOURCE_DIR}/files/p2p_supp.sh @ONLY)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/files/udhcp_script.non-autoip.in ${CMAKE_SOURCE_DIR}/files/udhcp_script.non-autoip @ONLY)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/files/wifi-direct-dhcp.sh.in ${CMAKE_SOURCE_DIR}/files/wifi-direct-dhcp.sh @ONLY)
@@ -29,8 +28,6 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/wifi-direct-server.sh DESTINATION ${BIN_
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/p2p_supp.sh DESTINATION ${SBIN_DIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/ccode.conf DESTINATION ${TZ_SYS_RO_ETC}/wifi-direct)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/dhcpd-notify.sh DESTINATION ${BIN_DIR})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/p2p_supp.conf DESTINATION ${TZ_SYS_RO_ETC}/wifi-direct)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/p2p_supp.conf DESTINATION ${TZ_SYS_ETC})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/dhcpd.conf DESTINATION ${TZ_SYS_RO_ETC}/wifi-direct)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/wifi-direct-manager.conf DESTINATION ${TZ_SYS_RO_ETC}/wifi-direct)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/wifi-direct-dhcp.sh DESTINATION ${BIN_DIR})

diff --git a/files/p2p_supp.conf.in b/files/p2p_supp.conf.in
deleted file mode 100644 (file)
index 3310467..0000000
--- a/files/p2p_supp.conf.in
+++ /dev/null
@@ -1,13 +0,0 @@
-##### p2p_supplicant configuration file template #####
-ctrl_interface=@TZ_SYS_RUN@/wpa_supplicant
-update_config=1
-eapol_version=1
-ap_scan=1
-p2p_listen_reg_class=81
-p2p_listen_channel=1
-p2p_oper_reg_class=81
-p2p_oper_channel=1
-device_name=Tizen
-device_type=10-0050F204-5
-config_methods=push_button,keypad,display
-driver_param=use_p2p_group_interface=0

diff --git a/files/p2p_supp.sh.in b/files/p2p_supp.sh.in
index eb663ca..bbe65e7 100644 (file)
--- a/files/p2p_supp.sh.in
+++ b/files/p2p_supp.sh.in
@@ -8,29 +8,17 @@ start()
        HARDWARE_MODEL=`@BIN_DIR@/grep Hardware /proc/cpuinfo | @BIN_DIR@/awk "{print \\$3}"`
        @BIN_DIR@/echo "Hardware Model=${HARDWARE_MODEL}"
 
-       if [ -e @TZ_SYS_ETC@/p2p_supp.conf ]; then
-               echo "File exist: @TZ_SYS_ETC@/p2p_supp.conf"
-       else
-               echo "File not exist. Reinstall: @TZ_SYS_ETC@/p2p_supp.conf"
-               @BIN_DIR@/cp @TZ_SYS_RO_ETC@/wifi-direct/p2p_supp.conf @TZ_SYS_ETC@/
-       fi
        ## For Hawk-P Platform, Hardware model is Samsung
        if [ $HARDWARE_MODEL = "Samsung" ];then
-               @SBIN_DIR@/wpa_supplicant -t -B -ddd -Dnl80211 -ip2p0 -c@TZ_SYS_ETC@/p2p_supp.conf -g@TZ_SYS_RUN@/wpa_global  -f/opt/usr/data/network/wpa_supplicant.log
+               @SBIN_DIR@/wpa_supplicant -t -B -ddd -Dnl80211 -ip2p0 -c@TZ_SYS_ETC@/wpa_supplicant/wpa_supplicant.conf -g@TZ_SYS_RUN@/wpa_global  -f/opt/usr/data/network/wpa_supplicant.log
         else
-               @BIN_DIR@/wpa_supplicant -t -B -ddd -O @TZ_SYS_RUN@/wpa_supplicant-Dnl80211 -iwlan0 -c@TZ_SYS_ETC@/p2p_supp.conf -f/opt/usr/data/network/wpa_supplicant.log
+               @BIN_DIR@/wpa_supplicant -t -B -ddd -O @TZ_SYS_RUN@/wpa_supplicant-Dnl80211 -iwlan0 -c@TZ_SYS_ETC@/wpa_supplicant/wpa_supplicant.conf -f/opt/usr/data/network/wpa_supplicant.log
        fi
  }
 
 start_p2p0()
 {
-       if [ -e @TZ_SYS_ETC@/p2p_supp.conf ]; then
-               echo "File exist: @TZ_SYS_ETC@/p2p_supp.conf"
-       else
-               echo "File not exist. Reinstall: @TZ_SYS_ETC@/p2p_supp.conf"
-                @BIN_DIR@/cp @TZ_SYS_RO_ETC@/wifi-direct/p2p_supp.conf @TZ_SYS_ETC@/
-       fi
-       @BIN_DIR@/wpa_supplicant -t -B -ddd -Dnl80211 -ip2p0 -c@TZ_SYS_ETC@/p2p_supp.conf -f/opt/usr/data/network/wpa_supplicant.log
+       @BIN_DIR@/wpa_supplicant -t -B -ddd -Dnl80211 -ip2p0 -c@TZ_SYS_ETC@/wpa_supplicant/wpa_supplicant.conf -f/opt/usr/data/network/wpa_supplicant.log
 }
 
 start_dbus()
@@ -39,12 +27,6 @@ start_dbus()
        run=`@BIN_DIR@/ps -eo comm| @BIN_DIR@/grep ${program}`
        if [ "X${run}" == "X" ]; then
                echo "${program} is not running"
-               if [ -e @TZ_SYS_ETC@/p2p_supp.conf ]; then
-                       echo "File exist: @TZ_SYS_ETC@/p2p_supp.conf"
-               else
-                       echo "File not exist. Reinstall: @TZ_SYS_ETC@/p2p_supp.conf"
-                        @BIN_DIR@/cp @TZ_SYS_RO_ETC@/wifi-direct/p2p_supp.conf @TZ_SYS_ETC@/
-               fi
                @BIN_DIR@/wpa_supplicant -t -B -u -ddd -O @TZ_SYS_RUN@/wpa_supplicant -g/var/run/wpa_global -K -f/opt/usr/data/network/wpa_supplicant.log
        else
                echo "${program} is already running"

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index befc7b8..9a177b2 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -6,7 +6,7 @@
 
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.273
+Version:       1.2.274
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0
@@ -258,9 +258,7 @@ mv -f %{_sysconfdir}/wifi-direct/wifi-direct-manager.conf.tv %{_sysconfdir}/wifi
 %config %{TZ_SYS_RO_ETC}/wifi-direct/ccode.conf
 %config %{TZ_SYS_RO_ETC}/wifi-direct/dhcpd.conf
 %config %{TZ_SYS_RO_ETC}/wifi-direct/wifi-direct-manager.conf
-%config %{TZ_SYS_RO_ETC}/wifi-direct/p2p_supp.conf
 %config %{_sysconfdir}/dbus-1/system.d/wfd-manager.conf
-%attr(644,-,-) %{TZ_SYS_ETC}/p2p_supp.conf
 %attr(755,-,-) %{_bindir}/dhcpd-notify.sh
 %attr(755,-,-) %{_bindir}/wifi-direct-server.sh
 %attr(755,-,-) %{_bindir}/wifi-direct-dhcp.sh