diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.br0.atheros.example b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.br0.atheros.example deleted file mode 100644 index c2b671a6e..000000000 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.br0.atheros.example +++ /dev/null @@ -1,8 +0,0 @@ - -## Example bridge between eth0 and wlan0 (Atheros AR6233) -#auto br0 -#iface br0 inet dhcp -# bridge_ports eth0 wlan0 -# bridge_wpa_driver nl80211 -# bridge_wpa_conf /etc/wpa_supplicant.conf -# pre-up [ $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio:c00v0271d0301) ] diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.br0.example b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.br0.example deleted file mode 100644 index ac9023c04..000000000 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.br0.example +++ /dev/null @@ -1,6 +0,0 @@ - -## Example bridge between eth0 and wlan1 (Qualcomm QCA65x4) -#auto br0 -#iface br0 inet dhcp -# bridge_ports eth0 wlan1 -# pre-up [ $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio:c00v0271d050A) ] diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.wlan1.atheros.dhcp b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.wlan1.atheros.dhcp deleted file mode 100644 index e6f114131..000000000 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.wlan1.atheros.dhcp +++ /dev/null @@ -1,8 +0,0 @@ - -# Wi-Fi AP interface (Atheros AR6233) -#auto wlan1 -iface wlan1 inet dhcp - udhcpc_opts -S -b >/dev/null & - pre-up [ $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio:c00v0271d0301) ] - wpa-driver nl80211 - wpa-conf /etc/wpa_supplicant.conf diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.wlan1.atheros.static b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.wlan1.atheros.static deleted file mode 100644 index eb8af110e..000000000 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.wlan1.atheros.static +++ /dev/null @@ -1,11 +0,0 @@ - -# Wi-Fi AP interface (Atheros AR6233) -#auto wlan1 -iface wlan1 inet static - address ##WLAN1_STATIC_IP## - netmask ##WLAN1_STATIC_NETMASK## - gateway ##WLAN1_STATIC_GATEWAY## - dns-nameservers ##WLAN1_STATIC_DNS## - pre-up [ $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio:c00v0271d0301) ] - wpa-driver nl80211 - wpa-conf /etc/wpa_supplicant.conf diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.wlan1.dhcp b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.wlan1.dhcp deleted file mode 100644 index 3f35e5aa4..000000000 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.wlan1.dhcp +++ /dev/null @@ -1,8 +0,0 @@ - -# Wi-Fi AP interface (Qualcomm QCA65x4) -#auto wlan1 -iface wlan1 inet dhcp - udhcpc_opts -S -b >/dev/null & - pre-up [ $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio:c00v0271d050A) ] - post-up ##WLAN1_POST_UP_ACTION## - pre-down ##WLAN1_PRE_DOWN_ACTION## diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.wlan1.static b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.wlan1.static deleted file mode 100644 index aa6bd09ea..000000000 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6sbc/interfaces.wlan1.static +++ /dev/null @@ -1,11 +0,0 @@ - -# Wi-Fi AP interface (Qualcomm QCA65x4) -#auto wlan1 -iface wlan1 inet static - address ##WLAN1_STATIC_IP## - netmask ##WLAN1_STATIC_NETMASK## - gateway ##WLAN1_STATIC_GATEWAY## - dns-nameservers ##WLAN1_STATIC_DNS## - pre-up [ $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio:c00v0271d050A) ] - post-up ##WLAN1_POST_UP_ACTION## - pre-down ##WLAN1_PRE_DOWN_ACTION## diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend index b36a7c6fc..c26137940 100644 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend @@ -22,12 +22,6 @@ SRC_URI:append = " \ ${@oe.utils.conditional('HAS_WIFI_VIRTWLANS', 'true', '${WIFI_VIRTWLANS_FILES}', '', d)} \ " -SRC_URI:append:ccimx6sbc = " \ - file://interfaces.wlan1.atheros.static \ - file://interfaces.wlan1.atheros.dhcp \ - file://interfaces.br0.atheros.example \ -" - SYSTEMD_SERVICE:${PN} = "ifupdown.service" WPA_DRIVER ?= "nl80211" @@ -71,11 +65,6 @@ do_install:append() { fi cat ${WORKDIR}/interfaces.br0.example >> ${D}${sysconfdir}/network/interfaces - if [ "${MACHINE}" = "ccimx6sbc" ]; then - # On ccimx6, append also the Atheros fragments so the user can - # decide which one to use depending on the wireless MAC used on the SOM. - cat ${WORKDIR}/interfaces.br0.atheros.example >> ${D}${sysconfdir}/network/interfaces - fi } install_virtwlans() { @@ -97,9 +86,7 @@ WLAN1_PRE_DOWN_ACTION:ccimx9 = "systemctl stop hostapd@uap0.service" install_wlan1() { cat ${WORKDIR}/interfaces.wlan1.${WLAN1_MODE} >> ${D}${sysconfdir}/network/interfaces - if [ "${MACHINE}" = "ccimx6sbc" ]; then - cat ${WORKDIR}/interfaces.wlan1.atheros.${WLAN1_MODE} >> ${D}${sysconfdir}/network/interfaces - fi + [ -n "${WLAN1_AUTO}" ] && sed -i -e 's/^#auto wlan1/auto wlan1/g' ${D}${sysconfdir}/network/interfaces # Remove config entries if corresponding variable is not defined