summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-01-11 19:44:33 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:53:17 +0000
commit573daf67349d12576fabbdeee403786fc7ef479b (patch)
treee7908ac3f75b01d2dec98506a7d8535f3f1bcc95 /meta
parent7a20966e0557c0792c943945143b71a69fd621a8 (diff)
downloadpoky-573daf67349d12576fabbdeee403786fc7ef479b.tar.gz
hdparm: upgrade to 9.37
The patch was imported from the OpenEmbedded server (http://git.openembedded.org/openembedded/tree/recipes/hdparm) as of commit id 4d2cb79dcecd056742f411a328f9f1f1113bf689. And changes include: - upgrade to the latest version 9.37 from 9.35. - added license checksum. - the license for wiper which is in hdparm is GPLv2. (From OE-Core rev: e46995adec82623342234e4a51bd8c12e6d62c3e) Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch37
-rw-r--r--meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch34
-rw-r--r--meta/recipes-extended/hdparm/hdparm_6.3.bb18
-rw-r--r--meta/recipes-extended/hdparm/hdparm_9.37.bb36
4 files changed, 36 insertions, 89 deletions
diff --git a/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch b/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
deleted file mode 100644
index 715886a9d5..0000000000
--- a/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Upstream-Status: Backport
2
3#
4# Patch managed by http://www.holgerschurig.de/patcher.html
5#
6
7--- hdparm-5.8/hdparm.c~bswap
8+++ hdparm-5.8/hdparm.c
9@@ -20,7 +20,9 @@
10 #include <linux/types.h>
11 #include <linux/hdreg.h>
12 #include <linux/major.h>
13-#include <asm/byteorder.h>
14+#include <byteswap.h>
15+
16+#define le16_to_cpus(x) bswap_16(htons(x))
17
18 #include "hdparm.h"
19
20@@ -1160,7 +1162,7 @@
21 }
22 } else {
23 for(i = 0; i < 0x100; ++i) {
24- __le16_to_cpus(&id[i]);
25+ le16_to_cpus(&id[i]);
26 }
27 identify((void *)id, NULL);
28 }
29@@ -1380,7 +1382,7 @@
30 }
31 for (i = 0; count >= 4; ++i) {
32 sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]);
33- __le16_to_cpus((__u16 *)(&sbuf[i]));
34+ le16_to_cpus((__u16 *)(&sbuf[i]));
35 b += 5;
36 count -= 5;
37 }
diff --git a/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch b/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
deleted file mode 100644
index d5f92989bd..0000000000
--- a/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3--- hdparm-5.8/hdparm.c.ark 2005-05-22 19:48:34.000000000 +0000
4+++ hdparm-5.8/hdparm.c 2005-05-22 19:52:18.000000000 +0000
5@@ -17,7 +17,9 @@
6 #include <sys/times.h>
7 #include <sys/types.h>
8 #include <sys/mount.h>
9+#ifndef __UCLIBC__
10 #include <linux/types.h>
11+#endif
12 #include <linux/hdreg.h>
13 #include <linux/major.h>
14 #include <byteswap.h>
15--- hdparm-5.8/hdparm.h.ark 2005-05-22 19:51:49.000000000 +0000
16+++ hdparm-5.8/hdparm.h 2005-05-22 19:54:54.000000000 +0000
17@@ -1,6 +1,6 @@
18 /* Some prototypes for extern functions. */
19
20-#include <linux/types.h> /* for __u16 */
21+#include <stdint.h>
22
23 #if !defined(__GNUC__) && !defined(__attribute__)
24 #define __attribute__(x) /* if not using GCC, turn off the __attribute__
25@@ -11,7 +11,7 @@
26 others, though, were declared in hdparm.c with global scope; since other
27 functions in that file have static (file) scope, I assume the difference is
28 intentional. */
29-extern void identify (__u16 *id_supplied, const char *devname);
30+extern void identify (uint16_t *id_supplied, const char *devname);
31
32 extern void usage_error(int out) __attribute__((noreturn));
33 extern int main(int argc, char **argv) __attribute__((noreturn));
34
diff --git a/meta/recipes-extended/hdparm/hdparm_6.3.bb b/meta/recipes-extended/hdparm/hdparm_6.3.bb
deleted file mode 100644
index 62ae4c0cc8..0000000000
--- a/meta/recipes-extended/hdparm/hdparm_6.3.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1SUMMARY = "Utility for displaying and setting hard disk parameters"
2DESCRIPTION = "hdparm is a system utility for viewing \
3and manipulating various IDE drive and driver parameters."
4SECTION = "console/utils"
5LICENSE = "BSD"
6LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=910a8a42c962d238619c75fdb78bdb24"
7
8SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz \
9 file://bswap.patch \
10 file://uclibc.patch"
11
12SRC_URI[md5sum] = "0c12672f3a09c14ad0b0882f15fc9389"
13SRC_URI[sha256sum] = "08688a6a46ba495494bf838f8f26103e797584c1888eca94e43a171e1b37246d"
14
15do_install () {
16 install -d ${D}/${sbindir} ${D}/${mandir}/man8
17 oe_runmake 'DESTDIR=${D}' install
18}
diff --git a/meta/recipes-extended/hdparm/hdparm_9.37.bb b/meta/recipes-extended/hdparm/hdparm_9.37.bb
new file mode 100644
index 0000000000..bfc64e776d
--- /dev/null
+++ b/meta/recipes-extended/hdparm/hdparm_9.37.bb
@@ -0,0 +1,36 @@
1DESCRIPTION = "hdparm is a Linux shell utility for viewing \
2and manipulating various IDE drive and driver parameters."
3SECTION = "console/utils"
4PRIORITY = "optional"
5LICENSE = "BSD"
6LICENSE_wiper = "GPLv2"
7LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=910a8a42c962d238619c75fdb78bdb24 \
8 file://debian/copyright;md5=a82d7ba3ade9e8ec902749db98c592f3 \
9 file://wiper/GPLv2.txt;md5=fcb02dc552a041dee27e4b85c7396067 \
10 file://wiper/wiper.sh;beginline=7;endline=31;md5=b7bc642addc152ea307505bf1a296f09"
11
12PACKAGES += "wiper"
13
14FILES_wiper = "${bindir}/wiper.sh"
15FILES_${PN} = "${base_sbindir} ${mandir}"
16
17RDEPENDS_wiper = "bash gawk stat"
18
19SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz "
20SRC_URI[md5sum] = "0bb94ddd1bedd5c02b1ca62f1caaf6de"
21SRC_URI[sha256sum] = "87ede0a7cb5b4de500748232e9d251b75acfccce078e1d42c8d125b9e5b4ccd3"
22
23do_install () {
24 install -d ${D}/${base_sbindir} ${D}/${mandir}/man8 ${D}/${bindir}
25 oe_runmake 'DESTDIR=${D}' 'sbindir=${base_sbindir}' install
26 mv ${D}${base_sbindir}/hdparm ${D}${base_sbindir}/hdparm.${PN}
27 cp ${S}/wiper/wiper.sh ${D}/${bindir}
28}
29
30pkg_postinst_${PN} () {
31 update-alternatives --install ${base_sbindir}/hdparm hdparm hdparm.${PN} 100
32}
33
34pkg_prerm_${PN} () {
35 update-alternatives --remove hdparm hdparm.${PN}
36}