upgrade hdparm to 9.37 and add its dependency stat 3.3
v2 cover upgrade hdparm to 9.37 and add its dependency stat 3.3
This patch is to upgrade hdparm to 9.37 and bring its new dependency stat 3.3. Please review.
The following changes since commit 468998cddbe1a803096c9b357e1b5daa3b7e8c2e:
command.py: add parseConfigurationFiles API (2012-01-06 16:01:44 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib shane/upgrade3
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=shane/upgrade3
Shane Wang (2):
stat: add recipe stat with version 3.3
hdparm: upgrade to 9.37
.../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 +++++++++++++++++++ meta/recipes-extended/stat/stat_3.3.bb | 26 ++++++++++++++ 5 files changed, 62 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 create mode 100644 meta/recipes-extended/stat/stat_3.3.bb
Signature · 1 line
1.7.6
PATCH v2 1/2 stat: add recipe stat with version 3.3
stat is brought into Yocto because the latest version hdparm 9.37 depends on it, and add license checksum.
The recipe was imported from the OpenEmbedded server
(http://git.openembedded.org/openembedded/tree/recipes/stat) as of commit ids 709c4d66e0b107ca606941b988bad717c0b45d9b, 44985d56bc556786812a0a02d6219afd31a7381d, b3246d96069fd11caee42ec6ebcbf6dca2d62449.
--- meta/recipes-extended/stat/stat_3.3.bb | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-extended/stat/stat_3.3.bb
meta/recipes-extended/stat/stat_3.3.bb new file +26 -0
@@ -0,0 +1,26 @@ +SECTION = "console/utils" +DESCRIPTION = "Display all information about a file that the stat() call provides and all information a filesystem that statfs() provides." +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=39886b077fd072e876e5c4c16310b631 \ + file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f" + +BBCLASSEXTEND = "native" + +PR = "r0" + +SRC_URI = "ftp://metalab.unc.edu/pub/Linux/utils/file/stat-3.3.tar.gz" +SRC_URI[md5sum] = "37e247e8e400ad9205f1b0500b728fd3" +SRC_URI[sha256sum] = "7071f0384a423a938dd542c1f08547a02824f6359acd3ef3f944b2c4c2d1ee09" + +do_install() { + install -d ${D}${bindir} ${D}${mandir}/man1 + install -m 755 stat ${D}${bindir} + install -m 644 stat.1 ${D}${mandir}/man1 +} + +#do_install_virtclass-native() { +# install -d ${D}${bindir} +# install -m 755 stat ${D}${bindir} +#} + +NATIVE_INSTALL_WORKS = "1"
Signature · 1 line
1.7.6
PATCH v2 2/2 hdparm: upgrade to 9.37
In reply to Shane WangThe 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.
--- .../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
meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch deleted +0 -37
@@ -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 <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" - -@@ -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; - }
meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch deleted +0 -34
@@ -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 <sys/times.h> - #include <sys/types.h> - #include <sys/mount.h> -+#ifndef __UCLIBC__ - #include <linux/types.h> -+#endif - #include <linux/hdreg.h> - #include <linux/major.h> - #include <byteswap.h> ---- 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 <linux/types.h> /* for __u16 */ -+#include <stdint.h> - - #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)); -
meta/recipes-extended/hdparm/hdparm_6.3.bb deleted +0 -18
@@ -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 -}
meta/recipes-extended/hdparm/hdparm_9.37.bb new file +36 -0
@@ -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} +}
Signature · 1 line
1.7.6
Saul Wold
AppliedQuoted 21 lines · Shane Wang
This patch is to upgrade hdparm to 9.37 and bring its new dependency stat 3.3. Please review.
The following changes since commit
468998cddbe1a803096c9b357e1b5daa3b7e8c2e:command.py: add parseConfigurationFiles API (2012-01-06 16:01:44 +0000)are available in the git repository at:
git://git.pokylinux.org/poky-contribshane/upgrade3
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=shane/upgrade3Shane Wang (2):
stat: add recipe stat with version 3.3
hdparm: upgrade to 9.37.../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 +++++++++++++++++++ meta/recipes-extended/stat/stat_3.3.bb | 26 ++++++++++++++ 5 files changed, 62 insertions(+), 89 deletions(-)
Quoted 6 lines
delete mode 100644
meta/recipes-extended/hdparm/hdparm-6.3/bswap.patchdelete mode 100644meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patchdelete mode 100644 meta/recipes-extended/hdparm/hdparm_6.3.bb create mode 100644 meta/recipes-extended/hdparm/hdparm_9.37.bb create mode 100644 meta/recipes-extended/stat/stat_3.3.bb
Merged into OE-Core
Thanks
Sau!