Merge "[Bugfix][API-752]set gsw wifi def ap ip 192.168.15.1 (ag)" into MR3.0-merge
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/images/mtk-image-2735.bb b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/images/mtk-image-2735.bb
index e68822b..313bc5d 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/images/mtk-image-2735.bb
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/images/mtk-image-2735.bb
@@ -161,6 +161,8 @@
mk_oem_init_part_rootfs_post() {
if [ "${MOBILETEK_OEMAPP_CFG}" = "GSW" ]; then
cp ${STAGING_DIR_HOST}/${datadir}/init/* ${IMAGE_ROOTFS}/${datadir}/init/
+ mkdir -p ${IMAGE_ROOTFS}/${datadir}/wg870/
+ cp ${STAGING_DIR_HOST}/${datadir}/wg870/wifi_network ${IMAGE_ROOTFS}/${datadir}/wg870/
fi
}
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/init-oem_1.0.0.bb b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/init-oem_1.0.0.bb
index 0d4276d..7026696 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/init-oem_1.0.0.bb
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/init-oem_1.0.0.bb
@@ -15,14 +15,14 @@
INSANE_SKIP_${PN} += "already-stripped"
FILES_${PN} = "${datadir}/init/init_mount \
- /etc/config/wifi_network \
+ ${datadir}/wg870/wifi_network \
${@bb.utils.contains('BOOTDEV_TYPE', 'nand', ' ${datadir}/init/init_mmc', ' ', d)} \
"
do_install_append() {
install -d ${D}${datadir}/init
- install -d ${D}/etc/config
- install -m 0644 wifi_network ${D}/etc/config/wifi_network
+ install -d ${D}${datadir}/wg870
+ install -m 0644 wifi_network ${D}${datadir}/wg870/wifi_network
if [ "${BOOTDEV_TYPE}" = "nand" ]; then
install -m 0755 init_mount_nand_gsw ${D}${datadir}/init/init_mount
install -m 0755 init_mmc ${D}${datadir}/init/init_mmc
diff --git a/meta/meta-mediatek-mt2735/recipes-connectivity/connman/connman/lynq_wifi_netmask.patch b/meta/meta-mediatek-mt2735/recipes-connectivity/connman/connman/lynq_wifi_netmask.patch
index a3bc18d..fad275d 100755
--- a/meta/meta-mediatek-mt2735/recipes-connectivity/connman/connman/lynq_wifi_netmask.patch
+++ b/meta/meta-mediatek-mt2735/recipes-connectivity/connman/connman/lynq_wifi_netmask.patch
@@ -19,7 +19,7 @@
+
+ DBG("");
+
-+ fp = fopen("/etc/config/wifi_network", "rb");
++ fp = fopen("/usr/share/wg870/wifi_network", "rb");
+ if (NULL == fp) {
+ return NULL;
+ }