[arch-commits] Commit in coreutils/repos (8 files)
Sébastien Luttringer
seblu at archlinux.org
Thu May 14 15:06:31 UTC 2015
Date: Thursday, May 14, 2015 @ 17:06:31
Author: seblu
Revision: 239348
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
coreutils/repos/testing-i686/
coreutils/repos/testing-i686/01-btrfs-alloc.patch
(from rev 239347, coreutils/trunk/01-btrfs-alloc.patch)
coreutils/repos/testing-i686/PKGBUILD
(from rev 239347, coreutils/trunk/PKGBUILD)
coreutils/repos/testing-i686/coreutils.install
(from rev 239347, coreutils/trunk/coreutils.install)
coreutils/repos/testing-x86_64/
coreutils/repos/testing-x86_64/01-btrfs-alloc.patch
(from rev 239347, coreutils/trunk/01-btrfs-alloc.patch)
coreutils/repos/testing-x86_64/PKGBUILD
(from rev 239347, coreutils/trunk/PKGBUILD)
coreutils/repos/testing-x86_64/coreutils.install
(from rev 239347, coreutils/trunk/coreutils.install)
-------------------------------------+
testing-i686/01-btrfs-alloc.patch | 96 ++++++++++++++++++++++++++++++++++
testing-i686/PKGBUILD | 53 ++++++++++++++++++
testing-i686/coreutils.install | 17 ++++++
testing-x86_64/01-btrfs-alloc.patch | 96 ++++++++++++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 53 ++++++++++++++++++
testing-x86_64/coreutils.install | 17 ++++++
6 files changed, 332 insertions(+)
Copied: coreutils/repos/testing-i686/01-btrfs-alloc.patch (from rev 239347, coreutils/trunk/01-btrfs-alloc.patch)
===================================================================
--- testing-i686/01-btrfs-alloc.patch (rev 0)
+++ testing-i686/01-btrfs-alloc.patch 2015-05-14 15:06:31 UTC (rev 239348)
@@ -0,0 +1,96 @@
+#http://debbugs.gnu.org/cgi/bugreport.cgi?bug=20570
+
+diff --git a/tests/cp/fiemap-empty.sh b/tests/cp/fiemap-empty.sh
+index a5eaac5..b3b2cd7 100755
+--- a/tests/cp/fiemap-empty.sh
++++ b/tests/cp/fiemap-empty.sh
+@@ -22,6 +22,7 @@ print_ver_ cp
+ # FIXME: enable any part of this test that is still relevant,
+ # or, if none are relevant (now that cp does not handle unwritten
+ # extents), just remove the test altogether.
++# Note also if checking allocations may need to sync first on BTRFS at least
+ skip_ 'disabled for now'
+
+ touch fiemap_chk
+diff --git a/tests/dd/sparse.sh b/tests/dd/sparse.sh
+index 4fdabad..626b405 100755
+--- a/tests/dd/sparse.sh
++++ b/tests/dd/sparse.sh
+@@ -17,6 +17,7 @@
+
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+ print_ver_ dd
++is_local_dir_ . || very_expensive_
+ require_sparse_support_
+
+ # Ensure basic sparse generation works
+@@ -50,6 +51,9 @@ dd if=/dev/zero of=file.in bs=1M count=1 seek=1 conv=notrunc || fail=1
+
+ kb_alloc() { du -k "$1"|cut -f1; }
+
++# sync out data for async allocators like NFS/BTRFS
++# sync file.in || fail=1
++
+ # If our just-created input file appears to be too small,
+ # skip the remaining tests. On at least Solaris 10 with NFS,
+ # file.in is reported to occupy <= 1KiB for about 50 seconds
+@@ -58,7 +62,10 @@ if test $(kb_alloc file.in) -gt 3000; then
+
+ # Ensure NUL blocks smaller than the block size are not made sparse.
+ # Here, with a 2MiB block size, dd's conv=sparse must *not* introduce a hole.
+- dd if=file.in of=file.out bs=2M conv=sparse
++ dd if=file.in of=file.out bs=2M conv=sparse || fail=1
++
++ # Intermittently BTRFS returns 0 allocation for file.out unless synced
++ sync file.out || framework_failure_
+ test 2500 -lt $(kb_alloc file.out) || fail=1
+
+ # Note we recreate a sparse file first to avoid
+diff --git a/tests/du/2g.sh b/tests/du/2g.sh
+index 5f04488..12c2eed 100755
+--- a/tests/du/2g.sh
++++ b/tests/du/2g.sh
+@@ -24,7 +24,6 @@ print_ver_ du
+ # Creating a 2GB file counts as 'very expensive'.
+ very_expensive_
+
+-
+ # Get number of free kilobytes on current partition, so we can
+ # skip this test if there is insufficient free space.
+ free_kb=$(df -k --output=avail . | tail -n1)
+@@ -42,16 +42,21 @@
+ }
+
+ big=big
+-rm -f $big
+-test -t 1 || printf 'creating a 2GB file...\n'
+-for i in $(seq 100); do
+- # Note: 2147483648 == 2^31. Print floor(2^31/100) per iteration.
+- printf %21474836s x >> $big || fail=1
+- # On the final iteration, append the remaining 48 bytes.
+- test $i = 100 && { printf %48s x >> $big || fail=1; }
+- test -t 1 && printf 'creating a 2GB file: %d%% complete\r' $i
+-done
+-echo
++if ! fallocate -l2G $big; then
++ rm -f $big
++ {
++ is_local_dir_ . || skip 'Not writing 2GB data to remote'
++ for i in $(seq 100); do
++ # Note: 2147483648 == 2^31. Print floor(2^31/100) per iteration.
++ printf %21474836s x || fail=1
++ done
++ # After the final iteration, append the remaining 48 bytes.
++ printf %48s x || fail=1
++ } > $big || fail=1
++fi
++
++# The allocation may be done asynchronously (BTRFS for example)
++sync $big || framework_failure_
+
+ du -k $big > out1 || fail=1
+ rm -f $big
+--
+2.3.4
+
+
Copied: coreutils/repos/testing-i686/PKGBUILD (from rev 239347, coreutils/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-05-14 15:06:31 UTC (rev 239348)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=coreutils
+pkgver=8.23
+pkgrel=2
+pkgdesc='The basic file, shell and text manipulation utilities of the GNU operating system'
+arch=('i686' 'x86_64')
+license=('GPL3')
+url='http://www.gnu.org/software/coreutils'
+groups=('base')
+depends=('glibc' 'acl' 'attr' 'gmp' 'libcap' 'openssl')
+install=$pkgname.install
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
+ '01-btrfs-alloc.patch')
+validpgpkeys=('6C37DC12121A5006BC1DB804DF6FD971306037D9') # Pádraig Brady
+md5sums=('abed135279f87ad6762ce57ff6d89c41'
+ 'SKIP'
+ '7333cea9afddff017dd0445fc5b8cc8f')
+
+prepare() {
+ local _p
+ for _p in *.patch; do
+ [[ -e $_p ]] || continue
+ msg2 "Applying $_p"
+ patch -p1 -d $pkgname-$pkgver < "$_p"
+ done
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --with-openssl \
+ --enable-no-install-program=groups,hostname,kill,uptime
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ RUN_VERY_EXPENSIVE_TESTS=yes make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: coreutils/repos/testing-i686/coreutils.install (from rev 239347, coreutils/trunk/coreutils.install)
===================================================================
--- testing-i686/coreutils.install (rev 0)
+++ testing-i686/coreutils.install 2015-05-14 15:06:31 UTC (rev 239348)
@@ -0,0 +1,17 @@
+infodir=usr/share/info
+file=coreutils.info
+
+post_install() {
+ [[ -x usr/bin/install-info ]] || return 0
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [[ -x usr/bin/install-info ]] || return 0
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
Copied: coreutils/repos/testing-x86_64/01-btrfs-alloc.patch (from rev 239347, coreutils/trunk/01-btrfs-alloc.patch)
===================================================================
--- testing-x86_64/01-btrfs-alloc.patch (rev 0)
+++ testing-x86_64/01-btrfs-alloc.patch 2015-05-14 15:06:31 UTC (rev 239348)
@@ -0,0 +1,96 @@
+#http://debbugs.gnu.org/cgi/bugreport.cgi?bug=20570
+
+diff --git a/tests/cp/fiemap-empty.sh b/tests/cp/fiemap-empty.sh
+index a5eaac5..b3b2cd7 100755
+--- a/tests/cp/fiemap-empty.sh
++++ b/tests/cp/fiemap-empty.sh
+@@ -22,6 +22,7 @@ print_ver_ cp
+ # FIXME: enable any part of this test that is still relevant,
+ # or, if none are relevant (now that cp does not handle unwritten
+ # extents), just remove the test altogether.
++# Note also if checking allocations may need to sync first on BTRFS at least
+ skip_ 'disabled for now'
+
+ touch fiemap_chk
+diff --git a/tests/dd/sparse.sh b/tests/dd/sparse.sh
+index 4fdabad..626b405 100755
+--- a/tests/dd/sparse.sh
++++ b/tests/dd/sparse.sh
+@@ -17,6 +17,7 @@
+
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+ print_ver_ dd
++is_local_dir_ . || very_expensive_
+ require_sparse_support_
+
+ # Ensure basic sparse generation works
+@@ -50,6 +51,9 @@ dd if=/dev/zero of=file.in bs=1M count=1 seek=1 conv=notrunc || fail=1
+
+ kb_alloc() { du -k "$1"|cut -f1; }
+
++# sync out data for async allocators like NFS/BTRFS
++# sync file.in || fail=1
++
+ # If our just-created input file appears to be too small,
+ # skip the remaining tests. On at least Solaris 10 with NFS,
+ # file.in is reported to occupy <= 1KiB for about 50 seconds
+@@ -58,7 +62,10 @@ if test $(kb_alloc file.in) -gt 3000; then
+
+ # Ensure NUL blocks smaller than the block size are not made sparse.
+ # Here, with a 2MiB block size, dd's conv=sparse must *not* introduce a hole.
+- dd if=file.in of=file.out bs=2M conv=sparse
++ dd if=file.in of=file.out bs=2M conv=sparse || fail=1
++
++ # Intermittently BTRFS returns 0 allocation for file.out unless synced
++ sync file.out || framework_failure_
+ test 2500 -lt $(kb_alloc file.out) || fail=1
+
+ # Note we recreate a sparse file first to avoid
+diff --git a/tests/du/2g.sh b/tests/du/2g.sh
+index 5f04488..12c2eed 100755
+--- a/tests/du/2g.sh
++++ b/tests/du/2g.sh
+@@ -24,7 +24,6 @@ print_ver_ du
+ # Creating a 2GB file counts as 'very expensive'.
+ very_expensive_
+
+-
+ # Get number of free kilobytes on current partition, so we can
+ # skip this test if there is insufficient free space.
+ free_kb=$(df -k --output=avail . | tail -n1)
+@@ -42,16 +42,21 @@
+ }
+
+ big=big
+-rm -f $big
+-test -t 1 || printf 'creating a 2GB file...\n'
+-for i in $(seq 100); do
+- # Note: 2147483648 == 2^31. Print floor(2^31/100) per iteration.
+- printf %21474836s x >> $big || fail=1
+- # On the final iteration, append the remaining 48 bytes.
+- test $i = 100 && { printf %48s x >> $big || fail=1; }
+- test -t 1 && printf 'creating a 2GB file: %d%% complete\r' $i
+-done
+-echo
++if ! fallocate -l2G $big; then
++ rm -f $big
++ {
++ is_local_dir_ . || skip 'Not writing 2GB data to remote'
++ for i in $(seq 100); do
++ # Note: 2147483648 == 2^31. Print floor(2^31/100) per iteration.
++ printf %21474836s x || fail=1
++ done
++ # After the final iteration, append the remaining 48 bytes.
++ printf %48s x || fail=1
++ } > $big || fail=1
++fi
++
++# The allocation may be done asynchronously (BTRFS for example)
++sync $big || framework_failure_
+
+ du -k $big > out1 || fail=1
+ rm -f $big
+--
+2.3.4
+
+
Copied: coreutils/repos/testing-x86_64/PKGBUILD (from rev 239347, coreutils/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-05-14 15:06:31 UTC (rev 239348)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=coreutils
+pkgver=8.23
+pkgrel=2
+pkgdesc='The basic file, shell and text manipulation utilities of the GNU operating system'
+arch=('i686' 'x86_64')
+license=('GPL3')
+url='http://www.gnu.org/software/coreutils'
+groups=('base')
+depends=('glibc' 'acl' 'attr' 'gmp' 'libcap' 'openssl')
+install=$pkgname.install
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
+ '01-btrfs-alloc.patch')
+validpgpkeys=('6C37DC12121A5006BC1DB804DF6FD971306037D9') # Pádraig Brady
+md5sums=('abed135279f87ad6762ce57ff6d89c41'
+ 'SKIP'
+ '7333cea9afddff017dd0445fc5b8cc8f')
+
+prepare() {
+ local _p
+ for _p in *.patch; do
+ [[ -e $_p ]] || continue
+ msg2 "Applying $_p"
+ patch -p1 -d $pkgname-$pkgver < "$_p"
+ done
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --with-openssl \
+ --enable-no-install-program=groups,hostname,kill,uptime
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ RUN_VERY_EXPENSIVE_TESTS=yes make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: coreutils/repos/testing-x86_64/coreutils.install (from rev 239347, coreutils/trunk/coreutils.install)
===================================================================
--- testing-x86_64/coreutils.install (rev 0)
+++ testing-x86_64/coreutils.install 2015-05-14 15:06:31 UTC (rev 239348)
@@ -0,0 +1,17 @@
+infodir=usr/share/info
+file=coreutils.info
+
+post_install() {
+ [[ -x usr/bin/install-info ]] || return 0
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [[ -x usr/bin/install-info ]] || return 0
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
More information about the arch-commits
mailing list