summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJeremy Laine <jeremy.laine@m4x.org>2008-04-28 15:39:55 +0000
committerJeremy Laine <jeremy.laine@m4x.org>2008-04-28 15:39:55 +0000
commit50cfa4afecc878d1ddde60e4254c801e4b4ba6e0 (patch)
tree49a5a18fc3c5ead016d6ac65ced9c5b602e5dd64 /packages
parent7be7517af3948a6a78b76805ff54958da3b92ac2 (diff)
hostap-daemon: use version 0.5.10 by default
Diffstat (limited to 'packages')
-rw-r--r--packages/hostap/hostap-daemon-0.5.10/.mtn2git_empty (renamed from packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty)0
-rw-r--r--packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff (renamed from packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff)20
-rw-r--r--packages/hostap/hostap-daemon_0.5.1.bb5
-rw-r--r--packages/hostap/hostap-daemon_0.5.10.bb (renamed from packages/hostap/hostap-daemon_0.6.3.bb)8
4 files changed, 18 insertions, 15 deletions
diff --git a/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty b/packages/hostap/hostap-daemon-0.5.10/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty
+++ b/packages/hostap/hostap-daemon-0.5.10/.mtn2git_empty
diff --git a/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff b/packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff
index 9534199e78..43b275c67b 100644
--- a/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff
+++ b/packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff
@@ -1,7 +1,13 @@
-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 @@
+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
@@ -10,7 +16,7 @@ diff -urN hostapd.orig/Makefile hostapd/Makefile
# 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 @@
+@@ -333,10 +337,10 @@
fi
install: all
@@ -21,5 +27,5 @@ diff -urN hostapd.orig/Makefile hostapd/Makefile
- $(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)
+ driver_conf.c: Makefile .config
+ rm -f driver_conf.c
diff --git a/packages/hostap/hostap-daemon_0.5.1.bb b/packages/hostap/hostap-daemon_0.5.1.bb
deleted file mode 100644
index de3abdbea5..0000000000
--- a/packages/hostap/hostap-daemon_0.5.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require hostap-daemon.inc
-
-PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/packages/hostap/hostap-daemon_0.6.3.bb b/packages/hostap/hostap-daemon_0.5.10.bb
index 37b710db19..f75efc4a34 100644
--- a/packages/hostap/hostap-daemon_0.6.3.bb
+++ b/packages/hostap/hostap-daemon_0.5.10.bb
@@ -5,14 +5,16 @@ PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
-DEFAULT_PREFERENCE = "-1"
+#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}/hostapd"
+S = "${WORKDIR}/hostapd-${PV}"
export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
@@ -28,7 +30,7 @@ do_configure() {
}
do_compile() {
- CFLAGS='${CFLAGS}' CC='${CC}' make
+ make
}
do_install() {