Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wpa_supplicant: unify config file for all platforms 

WPA and P2P configuration files are basically the same between all
platforms, so we remove all duplicated files to use a common file
and modify it in the recipe logic.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2020-01-09 11:29:23 +01:00
parent cece2ee984
commit 017c2d0964
19 changed files with 51 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-digi-arm/conf/machine/ccimx6qpsbc.conf
View File

@ -10,6 +10,7 @@ WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-mod
# Wireless p2p interface # Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0" WLAN_P2P_INTERFACE ?= "p2p0"
WLAN_P2P_DEVICE_NAME ?= "ccimx6qp-p2p"
MACHINE_EXTRA_RRECOMMENDS += " \ MACHINE_EXTRA_RRECOMMENDS += " \
cryptoauthlib \ cryptoauthlib \

3
meta-digi-arm/conf/machine/ccimx6sbc.conf
View File

@ -5,6 +5,9 @@
# Contains the ConnectCore 6 module. # Contains the ConnectCore 6 module.
include conf/machine/include/ccimx6.inc include conf/machine/include/ccimx6.inc
# Wireless p2p interface
WLAN_P2P_DEVICE_NAME ?= "ccimx6-p2p"
# Firmware # Firmware
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}"
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl', '', d)}"

10
meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
View File

@ -5,16 +5,6 @@
# Include the machine configuration for Digi's ConnectCore 8M Nano module. # Include the machine configuration for Digi's ConnectCore 8M Nano module.
include conf/machine/include/ccimx8mn.inc include conf/machine/include/ccimx8mn.inc
# Wireless external module
WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
# Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0"
# Firmware
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"
# U-Boot configurations # U-Boot configurations
# Last one is the default (the one the symlinks point at) # Last one is the default (the one the symlinks point at)
UBOOT_CONFIG ??= "ccimx8mn_dvk" UBOOT_CONFIG ??= "ccimx8mn_dvk"

10
meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
View File

@ -5,16 +5,6 @@
# Include the machine configuration for Digi's ConnectCore 8X module. # Include the machine configuration for Digi's ConnectCore 8X module.
include conf/machine/include/ccimx8x.inc include conf/machine/include/ccimx8x.inc
# Wireless external module
WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
# Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0"
# Firmware
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}"
# U-Boot configurations # U-Boot configurations
# Last one is the default (the one the symlinks point at) # Last one is the default (the one the symlinks point at)
UBOOT_CONFIG ??= "ccimx8x_sbc_express2GB ccimx8x_sbc_express1GB" UBOOT_CONFIG ??= "ccimx8x_sbc_express2GB ccimx8x_sbc_express1GB"

10
meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
View File

@ -5,16 +5,6 @@
# Include the machine configuration for Digi's ConnectCore 8X module. # Include the machine configuration for Digi's ConnectCore 8X module.
include conf/machine/include/ccimx8x.inc include conf/machine/include/ccimx8x.inc
# Wireless external module
WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
# Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0"
# Firmware
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}"
# U-Boot configurations # U-Boot configurations
# Last one is the default (the one the symlinks point at) # Last one is the default (the one the symlinks point at)
UBOOT_CONFIG ??= "ccimx8x_sbc_pro512MB ccimx8x_sbc_pro1GB ccimx8x_sbc_pro2GB" UBOOT_CONFIG ??= "ccimx8x_sbc_pro512MB ccimx8x_sbc_pro1GB ccimx8x_sbc_pro2GB"

1
meta-digi-arm/conf/machine/include/ccimx6ul.inc
View File

@ -18,6 +18,7 @@ WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-mod
# Wireless p2p interface # Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0" WLAN_P2P_INTERFACE ?= "p2p0"
WLAN_P2P_DEVICE_NAME ?= "ccimx6ul-p2p"
# Firmware # Firmware
MACHINE_FIRMWARE ?= "firmware-imx-sdma" MACHINE_FIRMWARE ?= "firmware-imx-sdma"

7
meta-digi-arm/conf/machine/include/ccimx8mn.inc
View File

@ -24,9 +24,16 @@ KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8_defconfig"
# Wireless external module # Wireless external module
WIRELESS_MODULE ?= "" WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
# Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0"
WLAN_P2P_DEVICE_NAME ?= "ccimx8mn-p2p"
# Firmware # Firmware
MACHINE_FIRMWARE ?= "firmware-imx-sdma firmware-imx-easrc" MACHINE_FIRMWARE ?= "firmware-imx-sdma firmware-imx-easrc"
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"
MACHINE_EXTRA_RDEPENDS += " \ MACHINE_EXTRA_RDEPENDS += " \
e2fsprogs-mke2fs \ e2fsprogs-mke2fs \

7
meta-digi-arm/conf/machine/include/ccimx8x.inc
View File

@ -31,9 +31,16 @@ KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8x_defconfig"
# Wireless external module # Wireless external module
WIRELESS_MODULE ?= "" WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
# Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0"
WLAN_P2P_DEVICE_NAME ?= "ccimx8x-p2p"
# Firmware # Firmware
MACHINE_FIRMWARE ?= "firmware-imx-vpu-imx8 firmware-imx-sdma" MACHINE_FIRMWARE ?= "firmware-imx-vpu-imx8 firmware-imx-sdma"
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}"
MACHINE_EXTRA_RDEPENDS += " \ MACHINE_EXTRA_RDEPENDS += " \
e2fsprogs-mke2fs \ e2fsprogs-mke2fs \

18
meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx6qpsbc/wpa_supplicant.conf-sane
View File

@ -1,18 +0,0 @@
ctrl_interface=/var/run/wpa_supplicant
ctrl_interface_group=0
fast_reauth=1
update_config=1
ap_scan=1
# Static scheduled scan interval time in seconds
#
# The wpa-supplicant dynamically adjusts the scheduled scan time interval. On
# occassions, fixing the interval time is helpful, for example on DFS channels.
#sched_scan_interval=2
network={
scan_ssid=1
ssid=""
key_mgmt=NONE
}

8
meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx6qpsbc/wpa_supplicant_p2p.conf
View File

@ -1,8 +0,0 @@
ctrl_interface=/var/run/wpa_supplicant
update_config=1
device_name=ccimx6qp-p2p
manufacturer=QCA
model_name=McK
device_type=1-0050F204-1
config_methods=display keypad push_button
persistent_reconnect=1

2
meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx6sbc/wpa_supplicant_p2p.conf
View File

@ -1,6 +1,6 @@
ctrl_interface=/var/run/wpa_supplicant ctrl_interface=/var/run/wpa_supplicant
ctrl_interface_group=0 ctrl_interface_group=0
device_name=ccimx6-p2p device_name=##WLAN_P2P_DEVICE_NAME##
device_type=10-0050F204-5 device_type=10-0050F204-5
config_methods=virtual_push_button keypad display pin config_methods=virtual_push_button keypad display pin
persistent_reconnect=1 persistent_reconnect=1

18
meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx6ul/wpa_supplicant.conf-sane
View File

@ -1,18 +0,0 @@
ctrl_interface=/var/run/wpa_supplicant
ctrl_interface_group=0
fast_reauth=1
update_config=1
ap_scan=1
# Static scheduled scan interval time in seconds
#
# The wpa-supplicant dynamically adjusts the scheduled scan time interval. On
# occassions, fixing the interval time is helpful, for example on DFS channels.
#sched_scan_interval=2
network={
scan_ssid=1
ssid=""
key_mgmt=NONE
}

8
meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx6ul/wpa_supplicant_p2p.conf
View File

@ -1,8 +0,0 @@
ctrl_interface=/var/run/wpa_supplicant
update_config=1
device_name=ccimx6ul-p2p
manufacturer=QCA
model_name=McK
device_type=1-0050F204-1
config_methods=display keypad push_button
persistent_reconnect=1

18
meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx8mn/wpa_supplicant.conf-sane
View File

@ -1,18 +0,0 @@
ctrl_interface=/var/run/wpa_supplicant
ctrl_interface_group=0
fast_reauth=1
update_config=1
ap_scan=1
# Static scheduled scan interval time in seconds
#
# The wpa-supplicant dynamically adjusts the scheduled scan time interval. On
# occassions, fixing the interval time is helpful, for example on DFS channels.
#sched_scan_interval=2
network={
scan_ssid=1
ssid=""
key_mgmt=NONE
}

18
meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx8x/wpa_supplicant.conf-sane
View File

@ -1,18 +0,0 @@
ctrl_interface=/var/run/wpa_supplicant
ctrl_interface_group=0
fast_reauth=1
update_config=1
ap_scan=1
# Static scheduled scan interval time in seconds
#
# The wpa-supplicant dynamically adjusts the scheduled scan time interval. On
# occassions, fixing the interval time is helpful, for example on DFS channels.
#sched_scan_interval=2
network={
scan_ssid=1
ssid=""
key_mgmt=NONE
}

8
meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx8x/wpa_supplicant_p2p.conf
View File

@ -1,8 +0,0 @@
ctrl_interface=/var/run/wpa_supplicant
update_config=1
device_name=ccimx8x-p2p
manufacturer=QCA
model_name=McK
device_type=1-0050F204-1
config_methods=display keypad push_button
persistent_reconnect=1

22
meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane
View File

@ -3,22 +3,16 @@ ctrl_interface_group=0
fast_reauth=1 fast_reauth=1
update_config=1 update_config=1
## -- Example MANAGED network ap_scan=1
ap_scan=1 # MANAGED mode
# Static scheduled scan interval time in seconds
#
# The wpa-supplicant dynamically adjusts the scheduled scan time interval. On
# occassions, fixing the interval time is helpful, for example on DFS channels.
#sched_scan_interval=2
network={ network={
scan_ssid=1 scan_ssid=1
ssid="" ssid=""
key_mgmt=NONE key_mgmt=NONE
} }
# -- SoftAP mode
# ap_scan=2
# network={
# ssid="ath6kl-ap"
# mode=2
# frequency=2412
# key_mgmt=WPA-PSK
# proto=RSN
# pairwise=CCMP
# psk="12345678"
# }

2
meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx8mn/wpa_supplicant_p2p.conf → meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant_p2p.conf
View File

@ -1,6 +1,6 @@
ctrl_interface=/var/run/wpa_supplicant ctrl_interface=/var/run/wpa_supplicant
update_config=1 update_config=1
device_name=ccimx8mn-p2p device_name=##WLAN_P2P_DEVICE_NAME##
manufacturer=QCA manufacturer=QCA
model_name=McK model_name=McK
device_type=1-0050F204-1 device_type=1-0050F204-1

23
meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend
View File

@ -1,4 +1,4 @@
# Copyright (C) 2013-2019 Digi International. # Copyright (C) 2013-2020 Digi International.
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
@ -12,6 +12,27 @@ SRC_URI += " \
do_install_append() { do_install_append() {
install -m 600 ${WORKDIR}/wpa_supplicant_p2p.conf ${D}${sysconfdir}/wpa_supplicant_p2p.conf install -m 600 ${WORKDIR}/wpa_supplicant_p2p.conf ${D}${sysconfdir}/wpa_supplicant_p2p.conf
sed -i -e "s,##WLAN_P2P_DEVICE_NAME##,${WLAN_P2P_DEVICE_NAME},g" \
${D}${sysconfdir}/wpa_supplicant_p2p.conf
}
do_install_append_ccimx6sbc() {
# Customize supplicant file
cat <<EOF >>${D}${sysconfdir}/wpa_supplicant.conf
# -- SoftAP mode
# ap_scan=2
# network={
# ssid="ath6kl-ap"
# mode=2
# frequency=2412
# key_mgmt=WPA-PSK
# proto=RSN
# pairwise=CCMP
# psk="12345678"
# }
EOF
} }
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"