Revert "tools/e2fsprogs: fix building on a glibc 2.27 host"

This reverts commit 58a95f0f8ff768b43d68eed2b6a786e0f40f723b.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index c5bdb1c0d47779d2a9222b70bf2a79395dd11565..fca90f2091b91dfde8a980e48a871dc8693551c2 100644 (file)
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=e2fsprogs
 PKG_VERSION:=1.43.3
 PKG_HASH:=ce8ef1bbb0d4730f170167284fda156ac9d6bf18db2750eb94af619a81b19927
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/e2fsprogs

diff --git a/tools/e2fsprogs/patches/005-misc-rename-copy_file_range-to-copy_file_chunk.patch b/tools/e2fsprogs/patches/005-misc-rename-copy_file_range-to-copy_file_chunk.patch
deleted file mode 100644 (file)
index bd6ee81..0000000
--- a/tools/e2fsprogs/patches/005-misc-rename-copy_file_range-to-copy_file_chunk.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 01551bdba16ab16512a01affe02ade32c41ede8a Mon Sep 17 00:00:00 2001
-From: Palmer Dabbelt <palmer@dabbelt.com>
-Date: Fri, 29 Dec 2017 10:19:51 -0800
-Subject: [PATCH] misc: rename copy_file_range to copy_file_chunk
-
-As of 2.27, glibc will have a copy_file_range library call to wrap the
-new copy_file_range system call.  This conflicts with the function in
-misc/create_inode.c, which this patch renames _copy_file_range.
-
-Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com>
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
- misc/create_inode.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/misc/create_inode.c
-+++ b/misc/create_inode.c
-@@ -392,7 +392,7 @@ static ssize_t my_pread(int fd, void *bu
- }
- #endif /* !defined HAVE_PREAD64 && !defined HAVE_PREAD */
- 
--static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file,
-+static errcode_t copy_file_chunk(ext2_filsys fs, int fd, ext2_file_t e2_file,
-                                off_t start, off_t end, char *buf,
-                                char *zerobuf)
- {
-@@ -466,7 +466,7 @@ static errcode_t try_lseek_copy(ext2_fil
- 
-               data_blk = data & ~(fs->blocksize - 1);
-               hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1);
--              err = copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf,
-+              err = copy_file_chunk(fs, fd, e2_file, data_blk, hole_blk, buf,
-                                     zerobuf);
-               if (err)
-                       return err;
-@@ -516,7 +516,7 @@ static errcode_t try_fiemap_copy(ext2_fi
-               }
-               for (i = 0, ext = ext_buf; i < fiemap_buf->fm_mapped_extents;
-                    i++, ext++) {
--                      err = copy_file_range(fs, fd, e2_file, ext->fe_logical,
-+                      err = copy_file_chunk(fs, fd, e2_file, ext->fe_logical,
-                                             ext->fe_logical + ext->fe_length,
-                                             buf, zerobuf);
-                       if (err)
-@@ -569,7 +569,7 @@ static errcode_t copy_file(ext2_filsys f
-               goto out;
- #endif
- 
--      err = copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf,
-+      err = copy_file_chunk(fs, fd, e2_file, 0, statbuf->st_size, buf,
-                             zerobuf);
- out:
-       ext2fs_free_mem(&zerobuf);