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

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 @@
-Index: wireless_tools.27/wireless.17.h
-===================================================================
---- wireless_tools.27.orig/wireless.17.h	2004-08-27 15:04:41.000000000 -0400
-+++ wireless_tools.27/wireless.17.h	2005-01-19 21:13:25.343064024 -0500
-@@ -71,9 +71,9 @@
- 
- /* To minimise problems in user space, I might remove those headers
-  * at some point. Jean II */
--#include <linux/types.h>		/* for "caddr_t" et al		*/
--#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
--#include <linux/if.h>			/* for IFNAMSIZ and co... */
-+#include <asm/types.h>		/* for "caddr_t" et al		*/
-+#include <sys/socket.h>		/* for "struct sockaddr" et al	*/
-+#include <net/if.h>			/* for IFNAMSIZ and co... */
- 
- /***************************** VERSION *****************************/
- /*
-Index: wireless_tools.27/iwlib.h
-===================================================================
---- wireless_tools.27.orig/iwlib.h	2004-10-28 20:09:47.000000000 -0400
-+++ wireless_tools.27/iwlib.h	2005-01-19 21:13:47.438704976 -0500
-@@ -123,9 +123,9 @@
- #endif	/* LIBC5_HEADERS */
- 
- /* Those 3 headers were previously included in wireless.h */
--#include <linux/types.h>		/* for "caddr_t" et al		*/
--#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
--#include <linux/if.h>			/* for IFNAMSIZ and co... */
-+#include <asm/types.h>		/* for "caddr_t" et al		*/
-+#include <sys/socket.h>		/* for "struct sockaddr" et al	*/
-+#include <net/if.h>			/* for IFNAMSIZ and co... */
- 
- /* Private copy of Wireless extensions */
- #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 @@
-DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
-HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.pre6.tar.gz \
-           file://man.patch;patch=1 \
-           file://fixheaders.patch;patch=1 \
-	   file://wireless-tools.if-pre-up"
-S = "${WORKDIR}/wireless_tools.28"
-
-CFLAGS =+ "-I${S}"
-EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \
-		'INSTALL_DIR=${D}${base_sbindir}' \
-		'INSTALL_LIB=${D}${libdir}' \
-		'INSTALL_INC=${D}${includedir}' \
-		'INSTALL_MAN=${D}${mandir}'"
-
-do_compile() {
-	oe_runmake all libiw.a
-}
-
-do_stage () {
-	install -m 0644 wireless.h ${STAGING_INCDIR}/
-	install -m 0644 iwlib.h ${STAGING_INCDIR}/
-	oe_libinstall -a -so libiw ${STAGING_LIBDIR}/
-}
-
-do_install() {
-	oe_runmake PREFIX=${D} install-iwmulticall install-dynamic
-	install -d ${D}${sysconfdir}/network/if-pre-up.d
-	install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools
-}
-
-PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc"
-FILES_libiw = "${libdir}/*.so.*"
-FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
-FILES_libiw-doc = "${mandir}/man7"
-FILES_${PN} = "${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
-FILES_${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"
 SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r3"
 
-SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre10.tar.gz \
+SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre20.tar.gz \
            file://man.patch;patch=1 \
 	   file://wireless-tools.if-pre-up \
 	   file://zzz-wireless.if-pre-up"