summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-04-24 13:17:03 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-04-24 13:17:03 +0000
commit73129cc6fd5ff7cc0dd7535d7f3d504e8439998f (patch)
tree1e10f7210707b9223133cfe2c0f2de6e58416eaa
parent43dace159ae76e05df3f2b43deebc0d4d3b0cde1 (diff)
downloadpoky-73129cc6fd5ff7cc0dd7535d7f3d504e8439998f.tar.gz
wireless-tools: updated to 29-pre20 (WE21 support, more WPA support)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1544 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/wireless-tools/wireless-tools/fixheaders.patch34
-rw-r--r--meta/packages/wireless-tools/wireless-tools_28-pre6.bb42
-rw-r--r--meta/packages/wireless-tools/wireless-tools_29-pre20.bb (renamed from meta/packages/wireless-tools/wireless-tools_29-pre10.bb)3
3 files changed, 1 insertions, 78 deletions
diff --git a/meta/packages/wireless-tools/wireless-tools/fixheaders.patch b/meta/packages/wireless-tools/wireless-tools/fixheaders.patch
deleted file mode 100644
index 670804e502..0000000000
--- a/meta/packages/wireless-tools/wireless-tools/fixheaders.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Index: wireless_tools.27/wireless.17.h
2===================================================================
3--- wireless_tools.27.orig/wireless.17.h 2004-08-27 15:04:41.000000000 -0400
4+++ wireless_tools.27/wireless.17.h 2005-01-19 21:13:25.343064024 -0500
5@@ -71,9 +71,9 @@
6
7 /* To minimise problems in user space, I might remove those headers
8 * at some point. Jean II */
9-#include <linux/types.h> /* for "caddr_t" et al */
10-#include <linux/socket.h> /* for "struct sockaddr" et al */
11-#include <linux/if.h> /* for IFNAMSIZ and co... */
12+#include <asm/types.h> /* for "caddr_t" et al */
13+#include <sys/socket.h> /* for "struct sockaddr" et al */
14+#include <net/if.h> /* for IFNAMSIZ and co... */
15
16 /***************************** VERSION *****************************/
17 /*
18Index: wireless_tools.27/iwlib.h
19===================================================================
20--- wireless_tools.27.orig/iwlib.h 2004-10-28 20:09:47.000000000 -0400
21+++ wireless_tools.27/iwlib.h 2005-01-19 21:13:47.438704976 -0500
22@@ -123,9 +123,9 @@
23 #endif /* LIBC5_HEADERS */
24
25 /* Those 3 headers were previously included in wireless.h */
26-#include <linux/types.h> /* for "caddr_t" et al */
27-#include <linux/socket.h> /* for "struct sockaddr" et al */
28-#include <linux/if.h> /* for IFNAMSIZ and co... */
29+#include <asm/types.h> /* for "caddr_t" et al */
30+#include <sys/socket.h> /* for "struct sockaddr" et al */
31+#include <net/if.h> /* for IFNAMSIZ and co... */
32
33 /* Private copy of Wireless extensions */
34 #include <wireless.h>
diff --git a/meta/packages/wireless-tools/wireless-tools_28-pre6.bb b/meta/packages/wireless-tools/wireless-tools_28-pre6.bb
deleted file mode 100644
index ba7caf9fd8..0000000000
--- a/meta/packages/wireless-tools/wireless-tools_28-pre6.bb
+++ /dev/null
@@ -1,42 +0,0 @@
1DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
2HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
3SECTION = "base"
4PRIORITY = "optional"
5LICENSE = "GPL"
6PR = "r1"
7
8SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.pre6.tar.gz \
9 file://man.patch;patch=1 \
10 file://fixheaders.patch;patch=1 \
11 file://wireless-tools.if-pre-up"
12S = "${WORKDIR}/wireless_tools.28"
13
14CFLAGS =+ "-I${S}"
15EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \
16 'INSTALL_DIR=${D}${base_sbindir}' \
17 'INSTALL_LIB=${D}${libdir}' \
18 'INSTALL_INC=${D}${includedir}' \
19 'INSTALL_MAN=${D}${mandir}'"
20
21do_compile() {
22 oe_runmake all libiw.a
23}
24
25do_stage () {
26 install -m 0644 wireless.h ${STAGING_INCDIR}/
27 install -m 0644 iwlib.h ${STAGING_INCDIR}/
28 oe_libinstall -a -so libiw ${STAGING_LIBDIR}/
29}
30
31do_install() {
32 oe_runmake PREFIX=${D} install-iwmulticall install-dynamic
33 install -d ${D}${sysconfdir}/network/if-pre-up.d
34 install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools
35}
36
37PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc"
38FILES_libiw = "${libdir}/*.so.*"
39FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
40FILES_libiw-doc = "${mandir}/man7"
41FILES_${PN} = "${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
42FILES_${PN}-doc = "${mandir}/man8"
diff --git a/meta/packages/wireless-tools/wireless-tools_29-pre10.bb b/meta/packages/wireless-tools/wireless-tools_29-pre20.bb
index b3d228c51b..3d3422dbfa 100644
--- a/meta/packages/wireless-tools/wireless-tools_29-pre10.bb
+++ b/meta/packages/wireless-tools/wireless-tools_29-pre20.bb
@@ -3,9 +3,8 @@ HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
3SECTION = "base" 3SECTION = "base"
4PRIORITY = "optional" 4PRIORITY = "optional"
5LICENSE = "GPL" 5LICENSE = "GPL"
6PR = "r3"
7 6
8SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre10.tar.gz \ 7SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre20.tar.gz \
9 file://man.patch;patch=1 \ 8 file://man.patch;patch=1 \
10 file://wireless-tools.if-pre-up \ 9 file://wireless-tools.if-pre-up \
11 file://zzz-wireless.if-pre-up" 10 file://zzz-wireless.if-pre-up"