madwifi-ng: merged slugos patches into mainline, dropped old versions.

12 files changed, 8 insertions, 63 deletions

diff --git a/packages/madwifi/files/10-xscale-be-elf-copts.patch b/packages/madwifi/files/10-xscale-be-elf-copts.patch
index 6349061c4c..1a08f3756e 100644
--- a/packages/madwifi/files/10-xscale-be-elf-copts.patch
+++ b/packages/madwifi/files/10-xscale-be-elf-copts.patch
@@ -1,7 +1,5 @@
-Index: madwifi-ng-r1871-20061229/hal/public/xscale-be-elf.inc
-===================================================================
---- madwifi-ng-r1871-20061229.orig/hal/public/xscale-be-elf.inc	2006-09-14 08:21:22.000000000 +0200
-+++ madwifi-ng-r1871-20061229/hal/public/xscale-be-elf.inc	2007-01-24 22:37:23.000000000 +0100
+--- madwifi.orig/hal/public/xscale-be-elf.inc	2007-01-03 23:42:09.000000000 -0600
++++ madwifi/hal/public/xscale-be-elf.inc	2007-01-03 23:48:50.000000000 -0600
 @@ -77,5 +77,5 @@
  
  LDOPTS=	-EB
@@ -9,4 +7,4 @@ Index: madwifi-ng-r1871-20061229/hal/public/xscale-be-elf.inc
 -COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \
 -	-mtune=xscale  -mshort-load-bytes
 +COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \
-+	-mtune=xscale -msoft-float -mfp=2
++	-mtune=xscale
diff --git a/packages/madwifi/files/10-xscale-le-elf-copts.patch b/packages/madwifi/files/10-xscale-le-elf-copts.patch
index 839bafa592..c4d9937220 100644
--- a/packages/madwifi/files/10-xscale-le-elf-copts.patch
+++ b/packages/madwifi/files/10-xscale-le-elf-copts.patch
@@ -1,10 +1,8 @@
-Index: madwifi-ng-r1871-20061229/hal/public/xscale-le-elf.inc
-===================================================================
---- madwifi-ng-r1871-20061229.orig/hal/public/xscale-le-elf.inc	2006-09-14 08:21:22.000000000 +0200
-+++ madwifi-ng-r1871-20061229/hal/public/xscale-le-elf.inc	2007-01-24 22:42:38.000000000 +0100
+--- madwifi.orig/hal/public/xscale-le-elf.inc	2007-01-03 23:42:06.000000000 -0600
++++ madwifi/hal/public/xscale-le-elf.inc	2007-01-03 23:48:50.000000000 -0600
 @@ -79,4 +79,4 @@
  LDOPTS=	-EL
  COPTS+=	-DAH_BYTE_ORDER=AH_LITTLE_ENDIAN
  COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \
 -	-mapcs-32 -mtune=xscale  -mshort-load-bytes
-+	-mtune=xscale -msoft-float -mfp=2
++	-mtune=xscale
diff --git a/packages/madwifi/files/slugos-VFP-wackelf.patch b/packages/madwifi/files/20-xscale-VFP-wackelf.patch
index a47eed79e7..a47eed79e7 100644
--- a/packages/madwifi/files/slugos-VFP-wackelf.patch
+++ b/packages/madwifi/files/20-xscale-VFP-wackelf.patch
diff --git a/packages/madwifi/files/slugos-xscale-be-elf-copts.patch b/packages/madwifi/files/slugos-xscale-be-elf-copts.patch
deleted file mode 100644
index 1a08f3756e..0000000000
--- a/packages/madwifi/files/slugos-xscale-be-elf-copts.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- madwifi.orig/hal/public/xscale-be-elf.inc	2007-01-03 23:42:09.000000000 -0600
-+++ madwifi/hal/public/xscale-be-elf.inc	2007-01-03 23:48:50.000000000 -0600
-@@ -77,5 +77,5 @@
- 
- LDOPTS=	-EB
- COPTS+=	-DAH_BYTE_ORDER=AH_BIG_ENDIAN
--COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \
--	-mtune=xscale  -mshort-load-bytes
-+COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \
-+	-mtune=xscale
diff --git a/packages/madwifi/files/slugos-xscale-le-elf-copts.patch b/packages/madwifi/files/slugos-xscale-le-elf-copts.patch
deleted file mode 100644
index c4d9937220..0000000000
--- a/packages/madwifi/files/slugos-xscale-le-elf-copts.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- madwifi.orig/hal/public/xscale-le-elf.inc	2007-01-03 23:42:06.000000000 -0600
-+++ madwifi/hal/public/xscale-le-elf.inc	2007-01-03 23:48:50.000000000 -0600
-@@ -79,4 +79,4 @@
- LDOPTS=	-EL
- COPTS+=	-DAH_BYTE_ORDER=AH_LITTLE_ENDIAN
- COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \
--	-mapcs-32 -mtune=xscale  -mshort-load-bytes
-+	-mtune=xscale
diff --git a/packages/madwifi/madwifi-ng-r1844-20061208/.mtn2git_empty b/packages/madwifi/madwifi-ng-r1844-20061208/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/madwifi/madwifi-ng-r1844-20061208/.mtn2git_empty
+++ /dev/null
diff --git a/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-be-elf-copts.patch b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-be-elf-copts.patch
deleted file mode 100644
index f285540d06..0000000000
--- a/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-be-elf-copts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: madwifi-ng-r1844-20061208/hal/public/xscale-be-elf.inc
-===================================================================
---- madwifi-ng-r1844-20061208.orig/hal/public/xscale-be-elf.inc
-+++ madwifi-ng-r1844-20061208/hal/public/xscale-be-elf.inc
-@@ -77,5 +77,5 @@ AH_REGOPS_FUNC=1
- 
- LDOPTS=	-EB
- COPTS+=	-DAH_BYTE_ORDER=AH_BIG_ENDIAN
--COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \
--	-mtune=xscale  -mshort-load-bytes
-+COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \
-+	-mtune=xscale -msoft-float -mfp=2
diff --git a/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-le-elf-copts.patch b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-le-elf-copts.patch
deleted file mode 100644
index 3224324699..0000000000
--- a/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-le-elf-copts.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: madwifi-ng-r1844-20061208/hal/public/xscale-le-elf.inc
-===================================================================
---- madwifi-ng-r1844-20061208.orig/hal/public/xscale-le-elf.inc
-+++ madwifi-ng-r1844-20061208/hal/public/xscale-le-elf.inc
-@@ -79,4 +79,4 @@ AH_REGOPS_FUNC=1
- LDOPTS=	-EL
- COPTS+=	-DAH_BYTE_ORDER=AH_LITTLE_ENDIAN
- COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \
--	-mapcs-32 -mtune=xscale  -mshort-load-bytes
-+	-mtune=xscale -msoft-float -mfp=2
diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc
index 6e4483f6f3..01d0e1e0d3 100644
--- a/packages/madwifi/madwifi-ng_r.inc
+++ b/packages/madwifi/madwifi-ng_r.inc
@@ -9,12 +9,8 @@ PR="r0"
 SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \
 	   file://10-xscale-be-elf-copts.patch;patch=1 \
 	   file://10-xscale-le-elf-copts.patch;patch=1 \
-	   file://10-sh4-le-elf-copts.patch;patch=1"
-
-SRC_URI_slugos = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \
-		  file://slugos-xscale-be-elf-copts.patch;patch=1 \
-		  file://slugos-xscale-le-elf-copts.patch;patch=1 \
-		  file://slugos-VFP-wackelf.patch;patch=1"
+	   file://10-sh4-le-elf-copts.patch;patch=1" \
+	   file://20-xscale-VFP-wackelf.patch;patch=1"
 
 S = "${WORKDIR}/${PN}-${PV}"
 
diff --git a/packages/madwifi/madwifi-ng_r1527-20060425.bb b/packages/madwifi/madwifi-ng_r1527-20060425.bb
deleted file mode 100644
index 84af37257d..0000000000
--- a/packages/madwifi/madwifi-ng_r1527-20060425.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require madwifi-ng_r.inc
-PR="r0"
diff --git a/packages/madwifi/madwifi-ng_r1692-20060723.bb b/packages/madwifi/madwifi-ng_r1692-20060723.bb
deleted file mode 100644
index 6268f2b78f..0000000000
--- a/packages/madwifi/madwifi-ng_r1692-20060723.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require madwifi-ng_r.inc
-PR="r1"
diff --git a/packages/madwifi/madwifi-ng_r1871-20061229.bb b/packages/madwifi/madwifi-ng_r1871-20061229.bb
deleted file mode 100644
index 42d8ccafe4..0000000000
--- a/packages/madwifi/madwifi-ng_r1871-20061229.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-PR = "r0"
-
-require madwifi-ng_r.inc