[oe-commits] org.oe.dev hostap-daemon: use version 0.5.10 by default

[jeremy_laine commit]

hostap-daemon: use version 0.5.10 by default

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: e8fcabd728e71161632456a9cb36e4e606e6dda8
ViewMTN: http://monotone.openembedded.org/revision/info/e8fcabd728e71161632456a9cb36e4e606e6dda8
Files:
1
packages/hostap/hostap-daemon-0.6.3
packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff
packages/hostap/hostap-daemon_0.5.1.bb
packages/hostap/hostap-daemon_0.6.3.bb
packages/hostap/hostap-daemon-0.5.10
packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff
packages/hostap/hostap-daemon_0.5.10.bb
Diffs:

#
# mt diff -r4ccbb7395e4fcfcca16dc9073c276a7cf4c1616e -re8fcabd728e71161632456a9cb36e4e606e6dda8
#
#
#
# delete "packages/hostap/hostap-daemon-0.6.3"
# 
# delete "packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff"
# 
# delete "packages/hostap/hostap-daemon_0.5.1.bb"
# 
# delete "packages/hostap/hostap-daemon_0.6.3.bb"
# 
# add_dir "packages/hostap/hostap-daemon-0.5.10"
# 
# add_file "packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff"
#  content [e291454f9d39e1948a9b6487276aa4d641662bde]
# 
# add_file "packages/hostap/hostap-daemon_0.5.10.bb"
#  content [1ef529afd5463790fc19d5fa6b3768c4b672ced8]
#
============================================================
--- packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff	e291454f9d39e1948a9b6487276aa4d641662bde
+++ packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff	e291454f9d39e1948a9b6487276aa4d641662bde
@@ -0,0 +1,31 @@
+diff -urN hostapd-0.5.10.orig/Makefile hostapd-0.5.10/Makefile
+--- hostapd-0.5.10.orig/Makefile	2008-02-20 01:08:54.000000000 +0100
++++ hostapd-0.5.10/Makefile	2008-04-28 17:01:36.000000000 +0200
+@@ -1,10 +1,14 @@
++ifndef CC
+ CC=gcc
++endif
+ DIR_WPA_SUPPLICANT=.
+ 
+ ifndef CFLAGS
+ 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
+@@ -333,10 +337,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)
+ 
+ driver_conf.c: Makefile .config
+ 	rm -f driver_conf.c
============================================================
--- packages/hostap/hostap-daemon_0.5.10.bb	1ef529afd5463790fc19d5fa6b3768c4b672ced8
+++ packages/hostap/hostap-daemon_0.5.10.bb	1ef529afd5463790fc19d5fa6b3768c4b672ced8
@@ -0,0 +1,42 @@
+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)}"
+
+#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
+MY_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"
+
+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}"
+
+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() {
+	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
+}
+