init-ifupdown: generalize recipe to avoid redefinitions

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2020-01-09 16:48:33 +01:00
parent a93a05a8af
commit 1fd0e8d6d8
1 changed files with 13 additions and 44 deletions

View File

@ -7,36 +7,19 @@ INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 80 0 6 1 ."
inherit systemd
WIFI_VIRTWLANS_FILES = " \
file://interfaces.wlan1.static \
file://interfaces.wlan1.dhcp \
file://virtwlans \
"
SRC_URI_append = " \
file://ifupdown.service \
file://interfaces.br0.example \
file://interfaces.p2p \
file://p2plink \
file://resolv \
"
SRC_URI_append_ccimx6qpsbc = "\
file://interfaces.wlan1.static \
file://interfaces.wlan1.dhcp \
file://virtwlans \
"
SRC_URI_append_ccimx6ul = "\
file://interfaces.wlan1.static \
file://interfaces.wlan1.dhcp \
file://virtwlans \
"
SRC_URI_append_ccimx8x = "\
file://interfaces.wlan1.static \
file://interfaces.wlan1.dhcp \
file://virtwlans \
"
SRC_URI_append_ccimx8mn = "\
file://interfaces.wlan1.static \
file://interfaces.wlan1.dhcp \
file://virtwlans \
${@oe.utils.conditional('HAS_WIFI_VIRTWLANS', 'true', '${WIFI_VIRTWLANS_FILES}', '', d)} \
"
SYSTEMD_SERVICE_${PN} = "ifupdown.service"
@ -75,6 +58,12 @@ do_install_append() {
sed -i -e "s,##WPA_DRIVER##,${WPA_DRIVER},g" ${D}${sysconfdir}/network/interfaces
cat ${WORKDIR}/interfaces.br0.example >> ${D}${sysconfdir}/network/interfaces
# Install virtual wlans files
if ${HAS_WIFI_VIRTWLANS}; then
install_virtwlans
install_wlan1
fi
}
install_virtwlans() {
@ -107,26 +96,6 @@ install_wlan1() {
sed -i -e "s,##WLAN1_PRE_DOWN_ACTION##,${WLAN1_PRE_DOWN_ACTION},g" ${D}${sysconfdir}/network/interfaces
}
do_install_append_ccimx6qpsbc() {
install_virtwlans
install_wlan1
}
do_install_append_ccimx6ul() {
install_virtwlans
install_wlan1
}
do_install_append_ccimx8x() {
install_virtwlans
install_wlan1
}
do_install_append_ccimx8mn() {
install_virtwlans
install_wlan1
}
# Disable wireless interfaces on first boot for non-wireless variants
pkg_postinst_ontarget_${PN}() {
if [ ! -d "/proc/device-tree/wireless" ]; then