MTX-3583 Update hostapd to v 2.9 from meta-openembedded

6 files changed, 5 insertions, 64 deletions

diff --git a/recipes-connectivity/hostapd/hostapd/default b/recipes-connectivity/hostapd/files/default
index 8f3287d..8f3287d 100644
--- a/recipes-connectivity/hostapd/hostapd/default
+++ b/recipes-connectivity/hostapd/files/default
diff --git a/recipes-connectivity/hostapd/hostapd/defconfig b/recipes-connectivity/hostapd/files/defconfig
index 3a447c6..3a447c6 100644
--- a/recipes-connectivity/hostapd/hostapd/defconfig
+++ b/recipes-connectivity/hostapd/files/defconfig
diff --git a/recipes-connectivity/hostapd/hostapd/init b/recipes-connectivity/hostapd/files/init
index 04fd2d0..04fd2d0 100644
--- a/recipes-connectivity/hostapd/hostapd/init
+++ b/recipes-connectivity/hostapd/files/init
diff --git a/recipes-connectivity/hostapd/hostapd/hostapd.service b/recipes-connectivity/hostapd/hostapd/hostapd.service
deleted file mode 100644
index 151c050..0000000
--- a/recipes-connectivity/hostapd/hostapd/hostapd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/hostapd.pid
-ExecStart=@SBINDIR@/hostapd @SYSCONFDIR@/hostapd.conf -P /run/hostapd.pid -B
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-connectivity/hostapd/hostapd_%.bbappend b/recipes-connectivity/hostapd/hostapd_%.bbappend
index 2686fa3..c8f8fab 100644
--- a/recipes-connectivity/hostapd/hostapd_%.bbappend
+++ b/recipes-connectivity/hostapd/hostapd_%.bbappend
@@ -1,5 +1,6 @@
-SRC_URI += "file://cfg80211.conf"
-PR = "m1"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+PR = "m2"
 
 do_install_append() {
 	install -d ${D}{sysconfdir}/modprobe.d
@@ -12,6 +13,8 @@ SRC_URI += " file://cfg80211.conf \
            file://WiFi-SSID \
            file://setchan \
            file://default \
+           file://init \
+           file://defconfig \
            "
 
 do_install() {
diff --git a/recipes-connectivity/hostapd/hostapd_2.8.bb b/recipes-connectivity/hostapd/hostapd_2.8.bb
deleted file mode 100644
index 15884d0..0000000
--- a/recipes-connectivity/hostapd/hostapd_2.8.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY = "User space daemon for extended IEEE 802.11 management"
-HOMEPAGE = "http://w1.fi/hostapd/"
-SECTION = "kernel/userland"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://hostapd/README;md5=1ec986bec88070e2a59c68c95d763f89"
-
-DEPENDS = "libnl openssl"
-
-SRC_URI = " \
-    http://w1.fi/releases/hostapd-${PV}.tar.gz \
-    file://defconfig \
-    file://init \
-    file://hostapd.service \
-"
-
-SRC_URI[md5sum] = "ed2c254e5f400838cb9d8e7b6e43b86c"
-SRC_URI[sha256sum] = "929f522be6eeec38c53147e7bc084df028f65f148a3f7e4fa6c4c3f955cee4b0"
-
-S = "${WORKDIR}/hostapd-${PV}"
-B = "${WORKDIR}/hostapd-${PV}/hostapd"
-
-inherit update-rc.d systemd pkgconfig distro_features_check
-
-CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers"
-
-INITSCRIPT_NAME = "hostapd"
-
-SYSTEMD_SERVICE_${PN} = "hostapd.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-
-do_configure_append() {
-    install -m 0644 ${WORKDIR}/defconfig ${B}/.config
-}
-
-do_compile() {
-    export CFLAGS="-MMD -O2 -Wall -g"
-    export EXTRA_CFLAGS="${CFLAGS}"
-    make V=1
-}
-
-do_install() {
-    install -d ${D}${sbindir} ${D}${sysconfdir}/init.d ${D}${systemd_unitdir}/system/
-    install -m 0644 ${B}/hostapd.conf ${D}${sysconfdir}
-    install -m 0755 ${B}/hostapd ${D}${sbindir}
-    install -m 0755 ${B}/hostapd_cli ${D}${sbindir}
-    install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
-    install -m 0644 ${WORKDIR}/hostapd.service ${D}${systemd_unitdir}/system/
-    sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd.service
-}
-
-CONFFILES_${PN} += "${sysconfdir}/hostapd.conf"