From 42406332d13e724e2abb052add98ac0e7316c7ac Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 13 Dec 2005 09:15:15 +0000 Subject: Update hdparm, initscripts (keymap), module-init-tools git-svn-id: https://svn.o-hand.com/repos/poky@192 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/hdparm/hdparm-6.1/bswap.patch | 36 ---------------------- .../packages/hdparm/hdparm-6.1/uclibc.patch | 32 ------------------- .../packages/hdparm/hdparm-6.3/bswap.patch | 36 ++++++++++++++++++++++ .../packages/hdparm/hdparm-6.3/uclibc.patch | 32 +++++++++++++++++++ openembedded/packages/hdparm/hdparm_6.3.bb | 14 +++++++++ 5 files changed, 82 insertions(+), 68 deletions(-) delete mode 100644 openembedded/packages/hdparm/hdparm-6.1/bswap.patch delete mode 100644 openembedded/packages/hdparm/hdparm-6.1/uclibc.patch create mode 100644 openembedded/packages/hdparm/hdparm-6.3/bswap.patch create mode 100644 openembedded/packages/hdparm/hdparm-6.3/uclibc.patch create mode 100644 openembedded/packages/hdparm/hdparm_6.3.bb (limited to 'openembedded/packages/hdparm') diff --git a/openembedded/packages/hdparm/hdparm-6.1/bswap.patch b/openembedded/packages/hdparm/hdparm-6.1/bswap.patch deleted file mode 100644 index 37fbcb7b3..000000000 --- a/openembedded/packages/hdparm/hdparm-6.1/bswap.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- hdparm-5.8/hdparm.c~bswap -+++ hdparm-5.8/hdparm.c -@@ -20,7 +20,9 @@ - #include - #include - #include --#include -+#include -+ -+#define le16_to_cpus(x) bswap_16(htons(x)) - - #include "hdparm.h" - -@@ -1160,7 +1162,7 @@ - } - } else { - for(i = 0; i < 0x100; ++i) { -- __le16_to_cpus(&id[i]); -+ le16_to_cpus(&id[i]); - } - identify((void *)id, NULL); - } -@@ -1380,7 +1382,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/openembedded/packages/hdparm/hdparm-6.1/uclibc.patch b/openembedded/packages/hdparm/hdparm-6.1/uclibc.patch deleted file mode 100644 index 495d7491b..000000000 --- a/openembedded/packages/hdparm/hdparm-6.1/uclibc.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- hdparm-5.8/hdparm.c.ark 2005-05-22 19:48:34.000000000 +0000 -+++ hdparm-5.8/hdparm.c 2005-05-22 19:52:18.000000000 +0000 -@@ -17,7 +17,9 @@ - #include - #include - #include -+#ifndef __UCLIBC__ - #include -+#endif - #include - #include - #include ---- hdparm-5.8/hdparm.h.ark 2005-05-22 19:51:49.000000000 +0000 -+++ hdparm-5.8/hdparm.h 2005-05-22 19:54:54.000000000 +0000 -@@ -1,6 +1,6 @@ - /* Some prototypes for extern functions. */ - --#include /* for __u16 */ -+#include - - #if !defined(__GNUC__) && !defined(__attribute__) - #define __attribute__(x) /* if not using GCC, turn off the __attribute__ -@@ -11,7 +11,7 @@ - others, though, were declared in hdparm.c with global scope; since other - functions in that file have static (file) scope, I assume the difference is - intentional. */ --extern void identify (__u16 *id_supplied, const char *devname); -+extern void identify (uint16_t *id_supplied, const char *devname); - - extern void usage_error(int out) __attribute__((noreturn)); - extern int main(int argc, char **argv) __attribute__((noreturn)); - diff --git a/openembedded/packages/hdparm/hdparm-6.3/bswap.patch b/openembedded/packages/hdparm/hdparm-6.3/bswap.patch new file mode 100644 index 000000000..37fbcb7b3 --- /dev/null +++ b/openembedded/packages/hdparm/hdparm-6.3/bswap.patch @@ -0,0 +1,36 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- hdparm-5.8/hdparm.c~bswap ++++ hdparm-5.8/hdparm.c +@@ -20,7 +20,9 @@ + #include + #include + #include +-#include ++#include ++ ++#define le16_to_cpus(x) bswap_16(htons(x)) + + #include "hdparm.h" + +@@ -1160,7 +1162,7 @@ + } + } else { + for(i = 0; i < 0x100; ++i) { +- __le16_to_cpus(&id[i]); ++ le16_to_cpus(&id[i]); + } + identify((void *)id, NULL); + } +@@ -1380,7 +1382,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/openembedded/packages/hdparm/hdparm-6.3/uclibc.patch b/openembedded/packages/hdparm/hdparm-6.3/uclibc.patch new file mode 100644 index 000000000..495d7491b --- /dev/null +++ b/openembedded/packages/hdparm/hdparm-6.3/uclibc.patch @@ -0,0 +1,32 @@ +--- hdparm-5.8/hdparm.c.ark 2005-05-22 19:48:34.000000000 +0000 ++++ hdparm-5.8/hdparm.c 2005-05-22 19:52:18.000000000 +0000 +@@ -17,7 +17,9 @@ + #include + #include + #include ++#ifndef __UCLIBC__ + #include ++#endif + #include + #include + #include +--- hdparm-5.8/hdparm.h.ark 2005-05-22 19:51:49.000000000 +0000 ++++ hdparm-5.8/hdparm.h 2005-05-22 19:54:54.000000000 +0000 +@@ -1,6 +1,6 @@ + /* Some prototypes for extern functions. */ + +-#include /* for __u16 */ ++#include + + #if !defined(__GNUC__) && !defined(__attribute__) + #define __attribute__(x) /* if not using GCC, turn off the __attribute__ +@@ -11,7 +11,7 @@ + others, though, were declared in hdparm.c with global scope; since other + functions in that file have static (file) scope, I assume the difference is + intentional. */ +-extern void identify (__u16 *id_supplied, const char *devname); ++extern void identify (uint16_t *id_supplied, const char *devname); + + extern void usage_error(int out) __attribute__((noreturn)); + extern int main(int argc, char **argv) __attribute__((noreturn)); + diff --git a/openembedded/packages/hdparm/hdparm_6.3.bb b/openembedded/packages/hdparm/hdparm_6.3.bb new file mode 100644 index 000000000..a91728951 --- /dev/null +++ b/openembedded/packages/hdparm/hdparm_6.3.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "hdparm is a Linux shell utility for viewing \ +and manipulating various IDE drive and driver parameters." +SECTION = "console/utils" +PRIORITY = "optional" +LICENSE = "BSD" + +SRC_URI = "http://www.ibiblio.org/pub/Linux/system/hardware/hdparm-${PV}.tar.gz \ + file://bswap.patch;patch=1 \ + file://uclibc.patch;patch=1" + +do_install () { + install -d ${D}/${sbindir} ${D}/${mandir}/man8 + oe_runmake 'DESTDIR=${D}' install +} -- cgit v1.2.3