[arch-commits] Commit in hdparm/repos (5 files)
Tobias Powalowski
tpowa at archlinux.org
Thu Nov 22 14:30:49 UTC 2018
Date: Thursday, November 22, 2018 @ 14:30:48
Author: tpowa
Revision: 340280
db-move: moved hdparm from [testing] to [core] (x86_64)
Added:
hdparm/repos/core-x86_64/PKGBUILD
(from rev 340279, hdparm/repos/testing-x86_64/PKGBUILD)
hdparm/repos/core-x86_64/wiper.sh.2_6.max-ranges.patch
(from rev 340279, hdparm/repos/testing-x86_64/wiper.sh.2_6.max-ranges.patch)
Deleted:
hdparm/repos/core-x86_64/PKGBUILD
hdparm/repos/core-x86_64/wiper.sh.2_6.max-ranges.patch
hdparm/repos/testing-x86_64/
-------------------------------------------+
/PKGBUILD | 43 ++++++++++++++
/wiper.sh.2_6.max-ranges.patch | 84 ++++++++++++++++++++++++++++
core-x86_64/PKGBUILD | 45 ---------------
core-x86_64/wiper.sh.2_6.max-ranges.patch | 84 ----------------------------
4 files changed, 127 insertions(+), 129 deletions(-)
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2018-11-22 14:27:27 UTC (rev 340279)
+++ core-x86_64/PKGBUILD 2018-11-22 14:30:48 UTC (rev 340280)
@@ -1,45 +0,0 @@
-# Maintainer: Paul Mattal <paul at archlinux.org>
-
-pkgname=hdparm
-pkgver=9.57
-pkgrel=1
-pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters"
-arch=(x86_64)
-depends=('glibc')
-optdepends=('sh: required by idectl and ultrabayd')
-source=(http://downloads.sourceforge.net/sourceforge/hdparm/${pkgname}-${pkgver}.tar.gz
- wiper.sh.2_6.max-ranges.patch)
-license=('BSD')
-url="http://sourceforge.net/projects/hdparm/"
-optdepends=('bash: for wiper.sh script')
-options=('emptydirs')
-sha512sumss=('410539d0bf3cc247181594581edbfb53'
- '74e368f384166a7710b447573cda120a')
-
-prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
- # Fix Range input/output error when wiping Intel G2 and OCZ drives
- patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch
-}
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- # install
- mkdir -p ${pkgdir}/usr/bin
- make DESTDIR=${pkgdir} sbindir=/usr/bin install
- install -m755 contrib/idectl ${pkgdir}/usr/bin
- install -m755 contrib/ultrabayd ${pkgdir}/usr/bin
-
- install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt
- install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/bin/wiper.sh
-
- #install license file
- install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT
-}
-md5sums=('cd976dc4c114ebb667a73df1200d0532'
- '74e368f384166a7710b447573cda120a')
Copied: hdparm/repos/core-x86_64/PKGBUILD (from rev 340279, hdparm/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2018-11-22 14:30:48 UTC (rev 340280)
@@ -0,0 +1,43 @@
+# Maintainer: Paul Mattal <paul at archlinux.org>
+
+pkgname=hdparm
+pkgver=9.58
+pkgrel=1
+pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters"
+arch=(x86_64)
+depends=('glibc')
+optdepends=('sh: required by idectl and ultrabayd')
+source=(http://downloads.sourceforge.net/sourceforge/hdparm/${pkgname}-${pkgver}.tar.gz
+ wiper.sh.2_6.max-ranges.patch)
+license=('BSD')
+url="http://sourceforge.net/projects/hdparm/"
+optdepends=('bash: for wiper.sh script')
+options=('emptydirs')
+sha512sums=('42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea'
+ 'ddb9eff6e4c0b67da72104a9ddcb6fde2b6ad543174e56a7e065453beb88f4c16b977718b1db4beaed41aff477a0ed955303172d019efbe9eacef2a397f27499')
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ # Fix Range input/output error when wiping Intel G2 and OCZ drives
+ patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ # install
+ mkdir -p ${pkgdir}/usr/bin
+ make DESTDIR=${pkgdir} sbindir=/usr/bin install
+ install -m755 contrib/idectl ${pkgdir}/usr/bin
+ install -m755 contrib/ultrabayd ${pkgdir}/usr/bin
+
+ install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt
+ install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/bin/wiper.sh
+
+ #install license file
+ install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT
+}
Deleted: core-x86_64/wiper.sh.2_6.max-ranges.patch
===================================================================
--- core-x86_64/wiper.sh.2_6.max-ranges.patch 2018-11-22 14:27:27 UTC (rev 340279)
+++ core-x86_64/wiper.sh.2_6.max-ranges.patch 2018-11-22 14:30:48 UTC (rev 340280)
@@ -1,84 +0,0 @@
---- hdparm-9.28/wiper/wiper.sh.orig 2010-03-09 06:17:37.000000000 -0800
---- hdparm-9.28/wiper/wiper.sh 2010-05-15 03:08:02.182856971 -0700
-@@ -29,7 +29,7 @@
- function usage_error(){
- echo >&2
- echo "Linux tune-up (TRIM) utility for SATA SSDs"
-- echo "Usage: $0 [--verbose] [--commit] <mount_point|block_device>" >&2
-+ echo "Usage: $0 [--max-ranges <num>] [--verbose] [--commit] <mount_point|block_device>" >&2
- echo " Eg: $0 /dev/sda1" >&2
- echo >&2
- exit 1
-@@ -44,6 +44,7 @@
-
- export verbose=0
- commit=""
-+max_ranges=-1
- destroy_me=""
- argc=$#
- arg=""
-@@ -51,6 +52,10 @@
- commit=yes
- elif [ "$1" = "--verbose" ]; then
- verbose=$((verbose + 1))
-+ elif [ "$1" = "--max-ranges" -a $argc -gt 1 ]; then
-+ max_ranges=$2
-+ argc=$((argc - 1))
-+ shift
- elif [ "$1" = "" ]; then
- usage_error
- else
-@@ -499,6 +550,18 @@
- fi
- fi
-
-+## Different SSD's have a different maximum number of ranges they'll accept
-+## in a single TRIM command.
-+if [ $max_ranges -le 0 ] ; then
-+ model=`$HDPARM -I $rawdev | $GAWK '/Model Number/ { print $NF }'`
-+ case "$model" in
-+ SSDSA[12]*) max_ranges=512 ;; # Intel X18-M/X25-M
-+ OCZ-VERTEX2) max_ranges=64 ;; # OCZ Vertex2
-+ *) max_ranges=65535
-+ esac
-+fi
-+[ $verbose -gt 0 ] && echo "max-ranges = $max_ranges"
-+
- ## All ready. Now let the user know exactly what we intend to do:
- ##
- mountstatus="$fstype non-mounted"
-@@ -608,7 +671,7 @@
- nsectors += count;
- while (count > 0) {
- this_count = (count > 65535) ? 65535 : count
-- printf "%u:%u ", lba, this_count
-+ printf "%u:%u \n", lba, this_count
- if (verbose > 1)
- printf "%u:%u ", lba, this_count > "/dev/stderr"
- lba += this_count
-@@ -695,6 +758,22 @@
- -v verbose="$verbose" \
- -v xfs_blksects="$xfs_blksects" \
- -v xfs_agoffsets="$xfs_agoffsets" \
-- "$GAWKPROG" | $TRIM
-+ "$GAWKPROG" | (
-+ i=0
-+ while read range ; do
-+ ranges=$ranges" "$range
-+ ((i++))
-+ if [ $i -ge $max_ranges ] ; then
-+ [ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n"
-+ echo $ranges | $TRIM
-+ ranges=""
-+ i=0
-+ fi
-+ done
-+ if [ $i -gt 0 ] ; then
-+ [ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n"
-+ echo $ranges | $TRIM
-+ fi
-+ )
-
- do_cleanup $?
-
-
Copied: hdparm/repos/core-x86_64/wiper.sh.2_6.max-ranges.patch (from rev 340279, hdparm/repos/testing-x86_64/wiper.sh.2_6.max-ranges.patch)
===================================================================
--- core-x86_64/wiper.sh.2_6.max-ranges.patch (rev 0)
+++ core-x86_64/wiper.sh.2_6.max-ranges.patch 2018-11-22 14:30:48 UTC (rev 340280)
@@ -0,0 +1,84 @@
+--- hdparm-9.28/wiper/wiper.sh.orig 2010-03-09 06:17:37.000000000 -0800
+--- hdparm-9.28/wiper/wiper.sh 2010-05-15 03:08:02.182856971 -0700
+@@ -29,7 +29,7 @@
+ function usage_error(){
+ echo >&2
+ echo "Linux tune-up (TRIM) utility for SATA SSDs"
+- echo "Usage: $0 [--verbose] [--commit] <mount_point|block_device>" >&2
++ echo "Usage: $0 [--max-ranges <num>] [--verbose] [--commit] <mount_point|block_device>" >&2
+ echo " Eg: $0 /dev/sda1" >&2
+ echo >&2
+ exit 1
+@@ -44,6 +44,7 @@
+
+ export verbose=0
+ commit=""
++max_ranges=-1
+ destroy_me=""
+ argc=$#
+ arg=""
+@@ -51,6 +52,10 @@
+ commit=yes
+ elif [ "$1" = "--verbose" ]; then
+ verbose=$((verbose + 1))
++ elif [ "$1" = "--max-ranges" -a $argc -gt 1 ]; then
++ max_ranges=$2
++ argc=$((argc - 1))
++ shift
+ elif [ "$1" = "" ]; then
+ usage_error
+ else
+@@ -499,6 +550,18 @@
+ fi
+ fi
+
++## Different SSD's have a different maximum number of ranges they'll accept
++## in a single TRIM command.
++if [ $max_ranges -le 0 ] ; then
++ model=`$HDPARM -I $rawdev | $GAWK '/Model Number/ { print $NF }'`
++ case "$model" in
++ SSDSA[12]*) max_ranges=512 ;; # Intel X18-M/X25-M
++ OCZ-VERTEX2) max_ranges=64 ;; # OCZ Vertex2
++ *) max_ranges=65535
++ esac
++fi
++[ $verbose -gt 0 ] && echo "max-ranges = $max_ranges"
++
+ ## All ready. Now let the user know exactly what we intend to do:
+ ##
+ mountstatus="$fstype non-mounted"
+@@ -608,7 +671,7 @@
+ nsectors += count;
+ while (count > 0) {
+ this_count = (count > 65535) ? 65535 : count
+- printf "%u:%u ", lba, this_count
++ printf "%u:%u \n", lba, this_count
+ if (verbose > 1)
+ printf "%u:%u ", lba, this_count > "/dev/stderr"
+ lba += this_count
+@@ -695,6 +758,22 @@
+ -v verbose="$verbose" \
+ -v xfs_blksects="$xfs_blksects" \
+ -v xfs_agoffsets="$xfs_agoffsets" \
+- "$GAWKPROG" | $TRIM
++ "$GAWKPROG" | (
++ i=0
++ while read range ; do
++ ranges=$ranges" "$range
++ ((i++))
++ if [ $i -ge $max_ranges ] ; then
++ [ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n"
++ echo $ranges | $TRIM
++ ranges=""
++ i=0
++ fi
++ done
++ if [ $i -gt 0 ] ; then
++ [ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n"
++ echo $ranges | $TRIM
++ fi
++ )
+
+ do_cleanup $?
+
+
More information about the arch-commits
mailing list