From 573daf67349d12576fabbdeee403786fc7ef479b Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Wed, 11 Jan 2012 19:44:33 +0800 Subject: 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 Signed-off-by: Richard Purdie --- .../recipes-extended/hdparm/hdparm-6.3/bswap.patch | 37 ---------------------- .../hdparm/hdparm-6.3/uclibc.patch | 34 -------------------- meta/recipes-extended/hdparm/hdparm_6.3.bb | 18 ----------- meta/recipes-extended/hdparm/hdparm_9.37.bb | 36 +++++++++++++++++++++ 4 files changed, 36 insertions(+), 89 deletions(-) delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch delete mode 100644 meta/recipes-extended/hdparm/hdparm_6.3.bb create mode 100644 meta/recipes-extended/hdparm/hdparm_9.37.bb (limited to 'meta/recipes-extended') 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 @@ -Upstream-Status: Backport - -# -# 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/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 @@ -Upstream-Status: Inappropriate [embedded specific] - ---- 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/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 @@ -SUMMARY = "Utility for displaying and setting hard disk parameters" -DESCRIPTION = "hdparm is a system utility for viewing \ -and manipulating various IDE drive and driver parameters." -SECTION = "console/utils" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=910a8a42c962d238619c75fdb78bdb24" - -SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz \ - file://bswap.patch \ - file://uclibc.patch" - -SRC_URI[md5sum] = "0c12672f3a09c14ad0b0882f15fc9389" -SRC_URI[sha256sum] = "08688a6a46ba495494bf838f8f26103e797584c1888eca94e43a171e1b37246d" - -do_install () { - install -d ${D}/${sbindir} ${D}/${mandir}/man8 - oe_runmake 'DESTDIR=${D}' install -} 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 @@ +DESCRIPTION = "hdparm is a Linux shell utility for viewing \ +and manipulating various IDE drive and driver parameters." +SECTION = "console/utils" +PRIORITY = "optional" +LICENSE = "BSD" +LICENSE_wiper = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=910a8a42c962d238619c75fdb78bdb24 \ + file://debian/copyright;md5=a82d7ba3ade9e8ec902749db98c592f3 \ + file://wiper/GPLv2.txt;md5=fcb02dc552a041dee27e4b85c7396067 \ + file://wiper/wiper.sh;beginline=7;endline=31;md5=b7bc642addc152ea307505bf1a296f09" + +PACKAGES += "wiper" + +FILES_wiper = "${bindir}/wiper.sh" +FILES_${PN} = "${base_sbindir} ${mandir}" + +RDEPENDS_wiper = "bash gawk stat" + +SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz " +SRC_URI[md5sum] = "0bb94ddd1bedd5c02b1ca62f1caaf6de" +SRC_URI[sha256sum] = "87ede0a7cb5b4de500748232e9d251b75acfccce078e1d42c8d125b9e5b4ccd3" + +do_install () { + install -d ${D}/${base_sbindir} ${D}/${mandir}/man8 ${D}/${bindir} + oe_runmake 'DESTDIR=${D}' 'sbindir=${base_sbindir}' install + mv ${D}${base_sbindir}/hdparm ${D}${base_sbindir}/hdparm.${PN} + cp ${S}/wiper/wiper.sh ${D}/${bindir} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${base_sbindir}/hdparm hdparm hdparm.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove hdparm hdparm.${PN} +} -- cgit v1.2.3-54-g00ecf