[arch-commits] Commit in coreutils/trunk (3 files)
Sébastien Luttringer
seblu at archlinux.org
Thu May 14 15:06:04 UTC 2015
Date: Thursday, May 14, 2015 @ 17:06:04
Author: seblu
Revision: 239347
upgpkg: coreutils 8.23-2
- fix FS#44404
- fix build on btrfs
Added:
coreutils/trunk/01-btrfs-alloc.patch
Modified:
coreutils/trunk/PKGBUILD
Deleted:
coreutils/trunk/0001-cp-don-t-reserve-a-device-number.patch
---------------------------------------------+
0001-cp-don-t-reserve-a-device-number.patch | 77 --------------------
01-btrfs-alloc.patch | 96 ++++++++++++++++++++++++++
PKGBUILD | 23 ++++--
3 files changed, 111 insertions(+), 85 deletions(-)
Deleted: 0001-cp-don-t-reserve-a-device-number.patch
===================================================================
--- 0001-cp-don-t-reserve-a-device-number.patch 2015-05-14 13:32:09 UTC (rev 239346)
+++ 0001-cp-don-t-reserve-a-device-number.patch 2015-05-14 15:06:04 UTC (rev 239347)
@@ -1,77 +0,0 @@
-From d0294ff3b90430750a631556277c75f1a555dd44 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert at cs.ucla.edu>
-Date: Thu, 3 Apr 2014 09:48:22 -0700
-Subject: [PATCH] cp: don't reserve a device number
-
-* src/copy.c (copy_internal): Replace dev_t arg DEVICE with struct
-stat pointer arg PARENT. All callers changed. This removes an
-unwarranted assumption that dev_t values of 0 cannot occur in file
-systems. See: http://bugs.gnu.org/17179
----
- src/copy.c | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/src/copy.c b/src/copy.c
-index 781cc1e..d471a77 100644
---- a/src/copy.c
-+++ b/src/copy.c
-@@ -117,7 +117,7 @@ struct dir_list
- #define DEST_INFO_INITIAL_CAPACITY 61
-
- static bool copy_internal (char const *src_name, char const *dst_name,
-- bool new_dst, dev_t device,
-+ bool new_dst, struct stat const *parent,
- struct dir_list *ancestors,
- const struct cp_options *x,
- bool command_line_arg,
-@@ -621,7 +621,7 @@ copy_dir (char const *src_name_in, char const *dst_name_in, bool new_dst,
- char *dst_name = file_name_concat (dst_name_in, namep, NULL);
- bool first_dir_created = *first_dir_created_per_command_line_arg;
-
-- ok &= copy_internal (src_name, dst_name, new_dst, src_sb->st_dev,
-+ ok &= copy_internal (src_name, dst_name, new_dst, src_sb,
- ancestors, &non_command_line_options, false,
- &first_dir_created,
- &local_copy_into_self, NULL);
-@@ -1725,9 +1725,8 @@ should_dereference (const struct cp_options *x, bool command_line_arg)
- /* Copy the file SRC_NAME to the file DST_NAME. The files may be of
- any type. NEW_DST should be true if the file DST_NAME cannot
- exist because its parent directory was just created; NEW_DST should
-- be false if DST_NAME might already exist. DEVICE is the device
-- number of the parent directory, or 0 if the parent of this file is
-- not known. ANCESTORS points to a linked, null terminated list of
-+ be false if DST_NAME might already exist. A nonnull PARENT describes the
-+ parent directory. ANCESTORS points to a linked, null terminated list of
- devices and inodes of parent directories of SRC_NAME. COMMAND_LINE_ARG
- is true iff SRC_NAME was specified on the command line.
- FIRST_DIR_CREATED_PER_COMMAND_LINE_ARG is both input and output.
-@@ -1737,7 +1736,7 @@ should_dereference (const struct cp_options *x, bool command_line_arg)
- static bool
- copy_internal (char const *src_name, char const *dst_name,
- bool new_dst,
-- dev_t device,
-+ struct stat const *parent,
- struct dir_list *ancestors,
- const struct cp_options *x,
- bool command_line_arg,
-@@ -2434,7 +2433,7 @@ copy_internal (char const *src_name, char const *dst_name,
- }
-
- /* Decide whether to copy the contents of the directory. */
-- if (x->one_file_system && device != 0 && device != src_sb.st_dev)
-+ if (x->one_file_system && parent && parent->st_dev != src_sb.st_dev)
- {
- /* Here, we are crossing a file system boundary and cp's -x option
- is in effect: so don't copy the contents of this directory. */
-@@ -2827,7 +2826,7 @@ copy (char const *src_name, char const *dst_name,
- top_level_dst_name = dst_name;
-
- bool first_dir_created_per_command_line_arg = false;
-- return copy_internal (src_name, dst_name, nonexistent_dst, 0, NULL,
-+ return copy_internal (src_name, dst_name, nonexistent_dst, NULL, NULL,
- options, true,
- &first_dir_created_per_command_line_arg,
- copy_into_self, rename_succeeded);
---
-1.9.1
-
Added: 01-btrfs-alloc.patch
===================================================================
--- 01-btrfs-alloc.patch (rev 0)
+++ 01-btrfs-alloc.patch 2015-05-14 15:06:04 UTC (rev 239347)
@@ -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
+
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-05-14 13:32:09 UTC (rev 239346)
+++ PKGBUILD 2015-05-14 15:06:04 UTC (rev 239347)
@@ -6,22 +6,29 @@
pkgname=coreutils
pkgver=8.23
-pkgrel=1
+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' 'pam' 'acl' 'gmp' 'libcap' 'openssl')
+depends=('glibc' 'acl' 'attr' 'gmp' 'libcap' 'openssl')
install=$pkgname.install
-source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
+ '01-btrfs-alloc.patch')
validpgpkeys=('6C37DC12121A5006BC1DB804DF6FD971306037D9') # Pádraig Brady
md5sums=('abed135279f87ad6762ce57ff6d89c41'
- 'SKIP')
+ 'SKIP'
+ '7333cea9afddff017dd0445fc5b8cc8f')
-#prepare() {
-# cd $pkgname-$pkgver
-#}
+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
@@ -35,7 +42,7 @@
check() {
cd $pkgname-$pkgver
- make RUN_EXPENSIVE_TESTS=yes check
+ RUN_VERY_EXPENSIVE_TESTS=yes make check
}
package() {
More information about the arch-commits
mailing list