Feature][T8TSK-200][connman] add option with/without connman
Change-Id: I9ede5cd28454975929d02e47eb8d7e927e0832cd
diff --git a/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb b/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
index 8fd2820..78c93ab 100755
--- a/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
+++ b/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
@@ -89,7 +89,9 @@
audio-ctrl-service \
audio-ctrl-service-bin \
mtk-phonecall-ioplugin \
- connman \
+ ${@bb.utils.contains("CONNMAN_SUPPORT", "no", "", "connman", d)} \
+ ${@bb.utils.contains("CONNMAN_SUPPORT", "no", "dnsmasq", "", d)} \
+ ${@bb.utils.contains("CONNMAN_SUPPORT", "no", "dhcpcd", "", d)} \
python3-cffi \
tel-demo \
libvendor-ril \
diff --git a/meta/meta-mediatek-mt2735/recipes-kernel/modules/wg870-drv-insmod.bb b/meta/meta-mediatek-mt2735/recipes-kernel/modules/wg870-drv-insmod.bb
index 13f034c..3df3928 100755
--- a/meta/meta-mediatek-mt2735/recipes-kernel/modules/wg870-drv-insmod.bb
+++ b/meta/meta-mediatek-mt2735/recipes-kernel/modules/wg870-drv-insmod.bb
@@ -32,4 +32,8 @@
install -m 755 ${WORKDIR}/wg870_drv_insmod.sh ${D}/etc/wg870/
install -m 755 ${WORKDIR}/wg870_drv_insmod.service ${D}${systemd_unitdir}/system/
+ if [ "${CONNMAN_SUPPORT}" = "no" ]; then
+ eval sed -i "s/\-dd\ \-t\ \-u/\-dd\ \-t/g" ${D}/etc/wg870/wg870_drv_insmod.sh
+ eval sed -i "/connmanctl/d" ${D}/etc/wg870/wg870_drv_insmod.sh
+ fi
}
diff --git a/meta/meta-mediatek-mt2735/recipes-lynq/lynq-wg870/lynq-wg870.bb b/meta/meta-mediatek-mt2735/recipes-lynq/lynq-wg870/lynq-wg870.bb
index 9cc57f3..83bef6e 100755
--- a/meta/meta-mediatek-mt2735/recipes-lynq/lynq-wg870/lynq-wg870.bb
+++ b/meta/meta-mediatek-mt2735/recipes-lynq/lynq-wg870/lynq-wg870.bb
@@ -3,17 +3,19 @@
DESCRIPTION = "wpa_supplicant test"
LICENSE = "CLOSED"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e1696b147d49d491bcb4da1a57173fff"
-DEPENDS += "platform-libs glib-2.0 openssl libnl dbus"
+DEPENDS += "platform-libs glib-2.0 openssl libnl"
+DEPENDS += "${@bb.utils.contains("CONNMAN_SUPPORT", "no", "", "dbus", d)}"
+
inherit workonsrc
WORKONSRC = "${TOPDIR}/../src/lynq/packages/thirdpart/lynq-wg870"
-LDFLAGS = "-L${STAGING_LIBDIR} -ldbus-1"
+LDFLAGS = "${@bb.utils.contains("CONNMAN_SUPPORT", "no", "", "-L${STAGING_LIBDIR} -ldbus-1", d)}"
TARGET_CC_ARCH += "${LDFLAGS}"
CFLAGS = "-I${STAGING_INCDIR}/libnl3"
-CFLAGS += "-I${STAGING_INCDIR}/dbus-${PV}"
-CFLAGS += "-I${STAGING_LIBDIR}/dbus-${PV}/include/"
+CFLAGS += "${@bb.utils.contains("CONNMAN_SUPPORT", "no", "", "-I${STAGING_INCDIR}/dbus-${PV}", d)}"
+CFLAGS += "${@bb.utils.contains("CONNMAN_SUPPORT", "no", "", "-I${STAGING_LIBDIR}/dbus-${PV}/include/", d)}"
#Parameters passed to do_compile()
@@ -43,6 +45,12 @@
export CONFIG_DRIVER_NL80211_IFX=y
export CONFIG_WEP=y
+ if [ "${CONNMAN_SUPPORT}" = "no" ]; then
+ sed -i "s/^CONFIG_CTRL_IFACE_DBUS_NEW=y/#CONFIG_CTRL_IFACE_DBUS_NEW=y/" ${S}wpa_supplicant/.config
+ else
+ sed -i "s/^#CONFIG_CTRL_IFACE_DBUS_NEW=y/CONFIG_CTRL_IFACE_DBUS_NEW=y/" ${S}wpa_supplicant/.config
+ fi
+
if test "${PACKAGE_ARCH}" = "cortexa7hf-vfp-vfpv4-neon" || test "${PACKAGE_ARCH}" = "cortexa7hf-neon-vfpv4"; then
oe_runmake all ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST} -mhard-float"
else
@@ -63,8 +71,10 @@
install -m 0644 ${S}conf/wpa_supplicant_ap.conf ${D}/data/wifi/wg870/
install -m 0644 ${S}conf/p2p_supplicant.conf ${D}/data/wifi/wg870/
- install -d ${D}/etc/dbus-1/system.d/
- install -m 0644 ${S}wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/etc/dbus-1/system.d/
+ if [ "${CONNMAN_SUPPORT}" != "no" ]; then
+ install -d ${D}/etc/dbus-1/system.d/
+ install -m 0644 ${S}wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/etc/dbus-1/system.d/
+ fi
install -d ${D}${includedir}/
install -m 0644 ${S}src/common/wpa_ctrl.h ${D}${includedir}/