[oe-commits] org.oe.dev hostap-daemon_0.6.0.bb: package version 0.6.0 of hostap-daemon

[jeremy_laine commit]

hostap-daemon_0.6.0.bb: package version 0.6.0 of hostap-daemon
* update makefile-cross.diff patch
* fix init script: pass -B to hostapd instead of passing -b 
  to start-stop-daemon
* instead of using per-machine enabling/disabling of madwifi
  support, use the 'pci' feature, like wpa-supplicant
* build against madwifi-ng when madwifi support is enabled

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 40f293b10b110d85c793d96acc26403ea53edb48
ViewMTN: http://monotone.openembedded.org/revision/info/40f293b10b110d85c793d96acc26403ea53edb48
Files:
1
packages/hostap/hostap-daemon-0.6.0
packages/hostap/hostap-daemon-0.6.0/init
packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
packages/hostap/hostap-daemon_0.6.0.bb
Diffs:

#
# mt diff -ra106a2f5d39ab684d2b6151a6be83d4897a0f2b6 -r40f293b10b110d85c793d96acc26403ea53edb48
#
# 
# 
# add_dir "packages/hostap/hostap-daemon-0.6.0"
# 
# add_file "packages/hostap/hostap-daemon-0.6.0/init"
#  content [80bfdea40d350f7069665dbcaf302de3874d55b3]
# 
# add_file "packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff"
#  content [8ff0a526fa703041b901ba825fab2cca7fbe1ca8]
# 
# add_file "packages/hostap/hostap-daemon_0.6.0.bb"
#  content [5eb3e365f82dc33607030d0705fdf7c84d502cdd]
# 
============================================================
--- packages/hostap/hostap-daemon-0.6.0/init	80bfdea40d350f7069665dbcaf302de3874d55b3
+++ packages/hostap/hostap-daemon-0.6.0/init	80bfdea40d350f7069665dbcaf302de3874d55b3
@@ -0,0 +1,37 @@
+#!/bin/sh
+DAEMON=/usr/sbin/hostapd
+NAME=hostapd
+DESC="HOSTAP Daemon"
+ARGS="/etc/hostapd.conf -B"
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+    start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S -x $DAEMON -- $ARGS
+	echo "$NAME."
+	;;
+    stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon -K -x $DAEMON
+	echo "$NAME."
+	;;
+    restart)
+	$0 stop
+	$0 start
+	;;
+    reload)
+	echo -n "Reloading $DESC: "
+	killall -HUP $(basename ${DAEMON})
+	echo "$NAME."
+	;;
+    *)
+	echo "Usage: $0 {start|stop|restart|reload}"
+	exit 1
+	;;
+esac
+
+exit 0
============================================================
--- packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff	8ff0a526fa703041b901ba825fab2cca7fbe1ca8
+++ packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff	8ff0a526fa703041b901ba825fab2cca7fbe1ca8
@@ -0,0 +1,25 @@
+diff -urN hostapd.orig/Makefile hostapd/Makefile
+--- hostapd.orig/Makefile	2007-05-28 19:26:55.000000000 +0200
++++ hostapd/Makefile	2007-11-22 16:28:44.000000000 +0100
+@@ -6,6 +6,8 @@
+ CFLAGS = -MMD -O2 -Wall -g
+ endif
+ 
++TARGET_PREFIX ?= /usr/local/bin/
++
+ # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
+ # a file (undefine it, if you want to save in binary size)
+ CFLAGS += -DHOSTAPD_DUMP_STATE
+@@ -361,10 +363,10 @@
+ 	fi
+ 
+ install: all
+-	for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
++	for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done
+ 
+ hostapd: $(OBJS)
+-	$(CC) -o hostapd $(OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
+ 
+ OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
+ hostapd_cli: $(OBJS_c)
============================================================
--- packages/hostap/hostap-daemon_0.6.0.bb	5eb3e365f82dc33607030d0705fdf7c84d502cdd
+++ packages/hostap/hostap-daemon_0.6.0.bb	5eb3e365f82dc33607030d0705fdf7c84d502cdd
@@ -0,0 +1,40 @@
+DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
+	file://makefile-cross.diff;patch=1 \
+	file://defconfig \
+	file://init"
+
+S = "${WORKDIR}/hostapd-${PV}/hostapd"
+
+export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
+
+inherit update-rc.d
+INITSCRIPT_NAME=hostapd
+
+do_configure() {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+	if [ "x$HAS_PCI" == "x1" ] ; then
+		echo "CONFIG_DRIVER_MADWIFI=y" >> .config
+		echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
+	fi
+}
+
+do_compile() {
+	CFLAGS='${CFLAGS}' CC='${CC}' make
+}
+
+do_install() {
+	install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
+	make TARGET_PREFIX=${D}${sbindir} install
+	install -m 0644 hostapd.conf ${D}${sysconfdir}
+	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
+}
+