From 3aee69d140c71457fa005ee3a1401af98195921b Mon Sep 17 00:00:00 2001
From: Roland Mainz <r.mainz@eckelmann.de>
Date: Tue, 2 Mar 2021 10:50:29 +0100
Subject: [PATCH] WIP: rmz workstate WIFI

---
 ptxdist/configs/ecu02/ptxconfig                    |  7 +-
 .../usr/lib/systemd/system/hostapd.service         |  2 +-
 ptxdist/local_src/ecu01-basicsys/usr/sbin/wlan-up  |  2 +-
 ptxdist/rules/hostapd.make                         | 81 ++++++++++++++++++++++
 4 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 ptxdist/rules/hostapd.make

diff --git a/ptxdist/configs/ecu02/ptxconfig b/ptxdist/configs/ecu02/ptxconfig
index e33dcbb..e375f10 100644
--- a/ptxdist/configs/ecu02/ptxconfig
+++ b/ptxdist/configs/ecu02/ptxconfig
@@ -1804,7 +1804,7 @@ PTXCONF_DHCP_DHCPD_CONF=y
 # PTXCONF_HAPROXY is not set
 # PTXCONF_HASERL is not set
 # PTXCONF_HAVEGED is not set
-# PTXCONF_HOSTAPD is not set
+PTXCONF_HOSTAPD=y
 # PTXCONF_HPING is not set
 # PTXCONF_IFPLUGD is not set
 # PTXCONF_IFTOP is not set
@@ -1965,7 +1965,10 @@ PTXCONF_RSYNC3_STARTSCRIPT=y
 PTXCONF_WIRELESS=y
 PTXCONF_WIRELESS_SHARED=y
 # PTXCONF_WIRESHARK is not set
-# PTXCONF_WPA_SUPPLICANT is not set
+PTXCONF_WPA_SUPPLICANT=y
+# PTXCONF_WPA_SUPPLICANT_CTRL_IFACE_DBUS is not set
+# PTXCONF_WPA_SUPPLICANT_PASSPHRASE is not set
+# PTXCONF_WPA_SUPPLICANT_INSTALL_CLI is not set
 # PTXCONF_WPAN_TOOLS is not set
 # PTXCONF_ZSYNC is not set
 
diff --git a/ptxdist/local_src/ecu-basicsys/usr/lib/systemd/system/hostapd.service b/ptxdist/local_src/ecu-basicsys/usr/lib/systemd/system/hostapd.service
index 0eb2811..6019960 100644
--- a/ptxdist/local_src/ecu-basicsys/usr/lib/systemd/system/hostapd.service
+++ b/ptxdist/local_src/ecu-basicsys/usr/lib/systemd/system/hostapd.service
@@ -5,7 +5,7 @@ BindsTo=wlan.target
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/hostapd -B /etc/hostapd/hostapd-device.conf 
+ExecStart=/usr/sbin/hostapd -B /etc/hostapd/hostapd-device.conf 
 ExecStop=/usr/bin/killall hostapd
 
 [Install]
diff --git a/ptxdist/local_src/ecu01-basicsys/usr/sbin/wlan-up b/ptxdist/local_src/ecu01-basicsys/usr/sbin/wlan-up
index 8fc7de1..97d73be 100755
--- a/ptxdist/local_src/ecu01-basicsys/usr/sbin/wlan-up
+++ b/ptxdist/local_src/ecu01-basicsys/usr/sbin/wlan-up
@@ -15,4 +15,4 @@ fi
 
 ssid w "$SSID"
 
-/usr/bin/hostapd -B /tmp/hostapd-device.conf
+/usr/sbin/hostapd -B /tmp/hostapd-device.conf
diff --git a/ptxdist/rules/hostapd.make b/ptxdist/rules/hostapd.make
new file mode 100644
index 0000000..7dfa80e
--- /dev/null
+++ b/ptxdist/rules/hostapd.make
@@ -0,0 +1,81 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2013 by Matthias Fend <matthias.fend@wolfvision.com>
+#               2015 by Marc Kleine-Budde <mkl@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_HOSTAPD) += hostapd
+
+#
+# Paths and names
+#
+HOSTAPD_NAME	:= hostapd
+HOSTAPD_VERSION	:= 2.9
+HOSTAPD_MD5	:= f188fc53a495fe7af3b6d77d3c31dee8
+HOSTAPD		:= $(HOSTAPD_NAME)-$(HOSTAPD_VERSION)
+HOSTAPD_SUFFIX	:= tar.gz
+HOSTAPD_URL	:= http://w1.fi/releases/$(HOSTAPD).$(HOSTAPD_SUFFIX)
+HOSTAPD_SOURCE	:= $(SRCDIR)/$(HOSTAPD).$(HOSTAPD_SUFFIX)
+HOSTAPD_DIR	:= $(BUILDDIR)/$(HOSTAPD)
+HOSTAPD_SUBDIR	:= $(HOSTAPD_NAME)
+# Use '=' to delay $(shell ...) calls until this is needed
+HOSTAPD_CONFIG	 = $(call ptx/get-alternative, config/hostapd, defconfig)
+HOSTAPD_DOTCONFIG := $(BUILDDIR)/$(HOSTAPD)/$(HOSTAPD_SUBDIR)/.config
+HOSTAPD_LICENSE	:= BSD-3-Clause
+HOSTAPD_LICENSE_FILES := \
+	file://COPYING;md5=279b4f5abb9c153c285221855ddb78cc \
+	file://README;md5=e7d3dbb01f75f0b9799e192731d1e1ff
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+HOSTAPD_MAKE_ENV := \
+	$(CROSS_ENV) \
+	BINDIR=/usr/sbin
+
+$(STATEDIR)/hostapd.prepare:
+	@$(call targetinfo)
+#	# run 'make clean' as hostapd's build system does not recognize config changes
+	@-$(HOSTAPD_MAKE_ENV) $(MAKE) -C $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR) clean
+	@cp $(HOSTAPD_CONFIG) $(HOSTAPD_DOTCONFIG)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/hostapd.install:
+	@$(call targetinfo)
+	@$(call world/install, HOSTAPD)
+	@install -v -m644 -D $(HOSTAPD_DIR)/hostapd/hostapd.conf \
+		$(HOSTAPD_PKGDIR)/etc/hostapd/hostapd.conf
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/hostapd.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, hostapd)
+	@$(call install_fixup, hostapd,PRIORITY,optional)
+	@$(call install_fixup, hostapd,SECTION,base)
+	@$(call install_fixup, hostapd,AUTHOR,"Matthias Fend <matthias.fend@wolfvision.com>")
+	@$(call install_fixup, hostapd,DESCRIPTION,missing)
+
+	@$(call install_copy, hostapd, 0, 0, 0755, -, /usr/sbin/hostapd)
+#	@$(call install_alternative, hostapd, 0, 0, 0644, /etc/hostapd/hostapd.conf)
+
+	@$(call install_finish, hostapd)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
1.9.1