commit: 55c33db6fe5ebb7dca458924db5fd6d7d23f3a95 Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Sun Jul 10 19:39:55 2016 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Fri Jul 15 05:38:05 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=55c33db6
sys-apps/hdparm: In tree version works Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=578456 sys-apps/hdparm/Manifest | 6 --- sys-apps/hdparm/files/hdparm-9.45-musl.patch | 35 ---------------- sys-apps/hdparm/files/hdparm-conf.d.3 | 26 ------------ sys-apps/hdparm/files/hdparm-init-8 | 61 ---------------------------- sys-apps/hdparm/hdparm-9.45-r99.ebuild | 42 ------------------- sys-apps/hdparm/metadata.xml | 11 ----- 6 files changed, 181 deletions(-) diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest deleted file mode 100644 index f76e682..0000000 --- a/sys-apps/hdparm/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX hdparm-9.45-musl.patch 1096 SHA256 8fc853886d40814cfcd21669cf261d122ed8f1903a2405c36f13943a3bb97da8 SHA512 2518f3e447bb16ff02e8bc0d0d219ce88be6c48ea26f86c5fad3848377867a3bb8421bd3e349dc03716a6d28c4d18d6e05586c4e1b2f82bd9288af24af746631 WHIRLPOOL c780dac1557c1147bbac4443191488a9fbcee03441f8d38570575ffda9ebdc3b40056a2de2595c3a7035f4ad6495f39f3929b4b0c3cdfdbdef23ccd533bc70a6 -AUX hdparm-conf.d.3 872 SHA256 37c95ff723fa578e9039613d09dbf790d99113a318c065422986c744519214e9 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02 WHIRLPOOL 110d330860c4f5e3b1626b85ab369a02e5c092acf656edc845a2f311b5349644317ec2021063a0fb977d3b9851e0bb9c54fd66e814a080d6af3aa0f05fbd658b -AUX hdparm-init-8 1366 SHA256 f06714b70d9c14f9e55cb21c12a79d9bd9e9c04647751eaf2fdf57381fd7de62 SHA512 39bdd79fcccd900370951f849ab425d2de01cedb063ec51a135013aaa7e5eacef9f5e89d936d677e920b17ad6a5052d812648f00048e672d6f26c6581c024c3f WHIRLPOOL 0550594f3abe7ca9498495c19abbb505edf3ac8c8531f10444a132070756c9f02569a250cd3c957f0b4cf33810dd7b3ab3a10b37d9814ec785a0596c8ee561fe -DIST hdparm-9.45.tar.gz 129410 SHA256 23b01caa56a995cf0897877b6aff98ea622a5df255bc2894b1a7693387f38669 SHA512 2692382f16fe9a87b7c9673bea44b8a9512b2449aaf18090f09c9e761fadc153f71d9779d063218f6951797649c0758f97242b7327da6653ea53991bf3da9eb8 WHIRLPOOL 6c424e265b7845afeff26f87654fbefe7d563404f2dee59f976594a87b375124262864305a14655bf5379e77e21bea0d8fb179e099374d7e8f952199f569ee58 -EBUILD hdparm-9.45-r99.ebuild 953 SHA256 292d3e5782c92375b907465276238860866dd2ddd1fb3c960136a71819fd3787 SHA512 3e9daf297361a50a566d39f89c5c93b067a05844fae9b7964c9ef644ddac0eefa0c74561279993957ccc5a23cdaa5ccdddb92e73f805434de16a3254e2477ce6 WHIRLPOOL c40a19b57f75590c089120988fc972b3b298ca4cc2c6891d74a3dc7c02d680eb2c2f0930f1f497e09c1f4c42f0ec4c90ed4db5b035598d34a80491ee5a5c42ef -MISC metadata.xml 326 SHA256 7be17151b3f5f5c65b8edad44e9c49ac62d306f856a257b67e0f01a1d6b1796d SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287 WHIRLPOOL 0c72b42d0ce47a7985115e1f65cd3a25bee06d41807b746e32966d69de586d4a84e22ffba08d1fbe0f0526d80074d8433813652e4512cadee0bbc847dac19e1b diff --git a/sys-apps/hdparm/files/hdparm-9.45-musl.patch b/sys-apps/hdparm/files/hdparm-9.45-musl.patch deleted file mode 100644 index a9fe0aa..0000000 --- a/sys-apps/hdparm/files/hdparm-9.45-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ur a/hdparm-9.45/fallocate.c b/hdparm-9.45/fallocate.c ---- a/hdparm-9.45/fallocate.c 2010-10-04 20:38:39.000000000 -0100 -+++ b/hdparm-9.45/fallocate.c 2015-01-28 21:19:59.201795557 -0100 -@@ -27,7 +27,7 @@ - err = EINVAL; - #else - int fd; -- loff_t offset = 0, len; -+ off_t offset = 0, len; - int mode = 0; - - fd = open(path, O_WRONLY|O_CREAT|O_EXCL, 0600); -diff -ur a/hdparm-9.45/hdparm.h b/hdparm-9.45/hdparm.h ---- a/hdparm-9.45/hdparm.h 2014-09-27 14:31:18.000000000 -0100 -+++ b/hdparm-9.45/hdparm.h 2015-01-28 21:19:08.662427386 -0100 -@@ -1,7 +1,7 @@ - /* Some prototypes for extern functions. */ - - //#undef __KERNEL_STRICT_NAMES --#include <linux/types.h> -+#include <sys/types.h> - - #if !defined(__GNUC__) && !defined(__attribute__) - #define __attribute__(x) -diff -ur a/hdparm-9.45/sysfs.c b/hdparm-9.45/sysfs.c ---- a/hdparm-9.45/sysfs.c 2010-10-04 20:39:20.000000000 -0100 -+++ b/hdparm-9.45/sysfs.c 2015-01-28 21:19:25.692214485 -0100 -@@ -13,6 +13,7 @@ - #include <fcntl.h> - #include <errno.h> - #include <dirent.h> -+#include <limits.h> - #include <sys/stat.h> - #include <linux/types.h> - diff --git a/sys-apps/hdparm/files/hdparm-conf.d.3 b/sys-apps/hdparm/files/hdparm-conf.d.3 deleted file mode 100644 index a1ae626..0000000 --- a/sys-apps/hdparm/files/hdparm-conf.d.3 +++ /dev/null @@ -1,26 +0,0 @@ -# /etc/conf.d/hdparm: config file for /etc/init.d/hdparm - -# -# Note that options such as -y which force *immediate* power saving options -# should generally not be placed here. The hdparm init.d script may run at -# anytime with respect to other init.d scripts that do system wide drive -# scans (like the hald script), so they will merely get spun right back up. -# If you wish to use these options, please use the local.start init.d script -# instead so that you're guaranteed that it will run last. -# - -# You can either set hdparm arguments for each drive using hdX_args, -# discX_args, cdromX_args and genericX_args, e.g. -# -# hda_args="-d1 -X66" -# disc1_args="-d1" -# cdrom0_args="-d1" - -# or you can set options for all PATA drives -pata_all_args="-d1" - -# or you can set options for all SATA drives -sata_all_args="" - -# or, you can set hdparm options for all drives -all_args="" diff --git a/sys-apps/hdparm/files/hdparm-init-8 b/sys-apps/hdparm/files/hdparm-init-8 deleted file mode 100644 index 9bf2385..0000000 --- a/sys-apps/hdparm/files/hdparm-init-8 +++ /dev/null @@ -1,61 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - before bootmisc -} - -do_hdparm() { - local e= - eval e=\$${extra_args} - [ -z "${args}${all_args}${e}" ] && return 0 - - if [ -n "${args:=${all_args} ${e}}" ] ; then - local orgdevice=$(readlink -f "${device}") - if [ -b "${orgdevice}" ] ; then - ebegin "Running hdparm on ${device}" - hdparm ${args} "${device}" > /dev/null - eend $? - fi - fi -} - -scan_nondevfs() { - # non-devfs compatible system - local device - - for device in /dev/hd* /dev/sd* /dev/cdrom* ; do - [ -e "${device}" ] || continue - case "${device}" in - *[0-9]) continue ;; - /dev/hd*) extra_args="pata_all_args" ;; - /dev/sd*) extra_args="sata_all_args" ;; - *) extra_args="_no_xtra_args" ;; - esac - - # check that the block device really exists by - # opening it for reading - local errmsg= status= nomed=1 - errmsg=$(export LC_ALL=C ; : 2>&1 <"${device}") - status=$? - case ${errmsg} in - *": No medium found") nomed=0;; - esac - if [ -b "${device}" ] && [ "${status}" = "0" -o "${nomed}" = "0" ] ; then - local conf_var="${device##*/}_args" - eval args=\$${conf_var} - do_hdparm - fi - done -} - -start() { - if get_bootparam "nohdparm" ; then - ewarn "Skipping hdparm init as requested in kernel cmdline" - return 0 - fi - - scan_nondevfs -} diff --git a/sys-apps/hdparm/hdparm-9.45-r99.ebuild b/sys-apps/hdparm/hdparm-9.45-r99.ebuild deleted file mode 100644 index 1503008..0000000 --- a/sys-apps/hdparm/hdparm-9.45-r99.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="Utility to change hard drive performance parameters" -HOMEPAGE="http://sourceforge.net/projects/hdparm/"; -SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz" - -LICENSE="BSD GPL-2" # GPL-2 only -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="static" - -src_prepare() { - use static && append-ldflags -static - sed -i \ - -e "/^CFLAGS/ s:-O2:${CFLAGS}:" \ - -e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \ - Makefile || die "sed" - epatch "${FILESDIR}"/${P}-musl.patch -} - -src_compile() { - emake STRIP=: CC="$(tc-getCC)" -} - -src_install() { - into / - dosbin hdparm contrib/idectl - - newinitd "${FILESDIR}"/hdparm-init-8 hdparm - newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm - - doman hdparm.8 - dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig - docinto wiper - dodoc wiper/{README.txt,wiper.sh} -} diff --git a/sys-apps/hdparm/metadata.xml b/sys-apps/hdparm/metadata.xml deleted file mode 100644 index dc7b624..0000000 --- a/sys-apps/hdparm/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Base System</name> -</maintainer> -<upstream> - <remote-id type="sourceforge">hdparm</remote-id> -</upstream> -</pkgmetadata>
