merge of 73d71ebcee8007b3d2a69a80d4387a817b24d046

     and fc56e135938d8b2230336b4fe9a01d8108180c98

10 files changed, 1 insertions, 112 deletions

diff --git a/packages/hdparm/hdparm-5.4/bswap.patch b/packages/hdparm/hdparm-5.4/bswap.patch
deleted file mode 100644
index 13670073a4..0000000000
--- a/packages/hdparm/hdparm-5.4/bswap.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c
---- hdparm-5.4/hdparm.c	2004-07-14 01:29:30.000000000 +0200
-+++ hdparm-5.4-fix/hdparm.c	2004-07-14 01:28:31.000000000 +0200
-@@ -20,7 +20,9 @@
- #include <linux/types.h>
- #include <linux/hdreg.h>
- #include <linux/major.h>
--#include <asm/byteorder.h>
-+#include <byteswap.h>
-+
-+#define le16_to_cpus(x) bswap_16(htons(x))
- 
- #include "hdparm.h"
- 
-@@ -1299,7 +1301,7 @@
- 			}
- 		}
- 		for(i=0; i<(sizeof args)/2; i+=2) {
--		    __le16_to_cpus((__u16 *)(&args[i]));
-+		    le16_to_cpus(*(__u16 *)(&args[i]));
- 		}    
- 		identify((void *)&args[4], NULL);
- identify_abort:	;
-@@ -1499,7 +1501,7 @@
- 	}
- 	for (i = 0; count >= 4; ++i) {
- 		sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]);
--		__le16_to_cpus((__u16 *)(&sbuf[i]));
-+		le16_to_cpus((__u16 *)(&sbuf[i]));
- 		b += 5;
- 		count -= 5;
- 	}
diff --git a/packages/hdparm/hdparm-5.4/readahead.patch b/packages/hdparm/hdparm-5.4/readahead.patch
deleted file mode 100644
index 2868d940d0..0000000000
--- a/packages/hdparm/hdparm-5.4/readahead.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c
---- hdparm-5.4/hdparm.c	2004-07-14 00:36:03.000000000 +0200
-+++ hdparm-5.4-fix/hdparm.c	2003-04-18 22:29:38.000000000 +0200
-@@ -52,7 +52,7 @@
- static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0;
- static int do_ctimings, do_timings = 0;
- 
--static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0;     
-+static unsigned long set_readahead= 0, get_readahead= 0, readahead_state= 0;
- static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0;
- static unsigned long set_unmask   = 0, get_unmask   = 0, unmask   = 0;     
- static unsigned long set_mult     = 0, get_mult     = 0, mult     = 0;     
-@@ -785,8 +785,8 @@
- 
- 	if (set_readahead) {
- 		if (get_readahead)
--			printf(" setting fs readahead to %ld\n", readahead);
--		if (ioctl(fd, BLKRASET, readahead)) 
-+			printf(" setting fs readahead to %ld\n", readahead_state);
-+		if (ioctl(fd, BLKRASET, readahead_state)) 
- 			perror(" BLKRASET failed");
- 	}
- #ifdef HDIO_UNREGISTER_HWIF
-@@ -1830,7 +1830,7 @@
- 					case 'a':
- 						get_readahead = noisy;
- 						noisy = 1;
--						GET_NUMBER(set_readahead,readahead);
-+						GET_NUMBER(set_readahead,readahead_state);
- 						break;
- 					case 'B':
- 						get_apmmode = noisy;
diff --git a/packages/hdparm/hdparm-5.8/.mtn2git_empty b/packages/hdparm/hdparm-5.8/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/hdparm/hdparm-5.8/.mtn2git_empty
+++ /dev/null
diff --git a/packages/hdparm/hdparm-5.8/readahead.patch b/packages/hdparm/hdparm-5.8/readahead.patch
deleted file mode 100644
index 2868d940d0..0000000000
--- a/packages/hdparm/hdparm-5.8/readahead.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c
---- hdparm-5.4/hdparm.c	2004-07-14 00:36:03.000000000 +0200
-+++ hdparm-5.4-fix/hdparm.c	2003-04-18 22:29:38.000000000 +0200
-@@ -52,7 +52,7 @@
- static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0;
- static int do_ctimings, do_timings = 0;
- 
--static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0;     
-+static unsigned long set_readahead= 0, get_readahead= 0, readahead_state= 0;
- static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0;
- static unsigned long set_unmask   = 0, get_unmask   = 0, unmask   = 0;     
- static unsigned long set_mult     = 0, get_mult     = 0, mult     = 0;     
-@@ -785,8 +785,8 @@
- 
- 	if (set_readahead) {
- 		if (get_readahead)
--			printf(" setting fs readahead to %ld\n", readahead);
--		if (ioctl(fd, BLKRASET, readahead)) 
-+			printf(" setting fs readahead to %ld\n", readahead_state);
-+		if (ioctl(fd, BLKRASET, readahead_state)) 
- 			perror(" BLKRASET failed");
- 	}
- #ifdef HDIO_UNREGISTER_HWIF
-@@ -1830,7 +1830,7 @@
- 					case 'a':
- 						get_readahead = noisy;
- 						noisy = 1;
--						GET_NUMBER(set_readahead,readahead);
-+						GET_NUMBER(set_readahead,readahead_state);
- 						break;
- 					case 'B':
- 						get_apmmode = noisy;
diff --git a/packages/hdparm/hdparm-5.4/.mtn2git_empty b/packages/hdparm/hdparm-6.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/hdparm/hdparm-5.4/.mtn2git_empty
+++ b/packages/hdparm/hdparm-6.1/.mtn2git_empty
diff --git a/packages/hdparm/hdparm-5.8/bswap.patch b/packages/hdparm/hdparm-6.1/bswap.patch
index 37fbcb7b38..37fbcb7b38 100644
--- a/packages/hdparm/hdparm-5.8/bswap.patch
+++ b/packages/hdparm/hdparm-6.1/bswap.patch
diff --git a/packages/hdparm/hdparm-5.8/uclibc.patch b/packages/hdparm/hdparm-6.1/uclibc.patch
index 495d7491bb..495d7491bb 100644
--- a/packages/hdparm/hdparm-5.8/uclibc.patch
+++ b/packages/hdparm/hdparm-6.1/uclibc.patch
diff --git a/packages/hdparm/hdparm_5.4.bb b/packages/hdparm/hdparm_5.4.bb
deleted file mode 100644
index 21b5bd5d4d..0000000000
--- a/packages/hdparm/hdparm_5.4.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "hdparm is a Linux shell utility for viewing \
-and manipulating various IDE drive and driver parameters."
-SECTION = "console/utils"
-PRIORITY = "optional"
-LICENSE = "BSD"
-PR = "r1"
-
-SRC_URI = "http://www.ibiblio.org/pub/Linux/system/hardware/hdparm-${PV}.tar.gz \
-	   file://bswap.patch;patch=1 \
-	   file://readahead.patch;patch=1"
-
-do_install () {
-	install -d ${D}${sbindir} ${D}${mandir}/man8
-	oe_runmake 'DESTDIR=${D}' install
-}
diff --git a/packages/hdparm/hdparm_5.8.bb b/packages/hdparm/hdparm_6.1.bb
index a917289513..a917289513 100644
--- a/packages/hdparm/hdparm_5.8.bb
+++ b/packages/hdparm/hdparm_6.1.bb
diff --git a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
index 8042a9789c..8a4fd421e7 100644
--- a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
+++ b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "unknown"
 
-SRC_URI = "http://www.red-bean.com/~proski/firmware/1.7.4.tar.gz"
+SRC_URI = "http://www.red-bean.com/~proski/firmware/${PV}.tar.bz2"
 
 INHIBIT_PACKAGE_STRIP = "1"