diff options
| author | John Crispin <john@openwrt.org> | 2012-02-14 19:07:07 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2012-02-14 19:07:07 +0000 |
| commit | 58b26b60d338e757f3dd88742a3166a80404d8f0 (patch) | |
| tree | 0d905ec4b03cd296078386793cfcf058c170736b /package/e2fsprogs/patches | |
| parent | 7416a5f0aa7bd9a239baf7ded112d2339884aa8a (diff) | |
| download | upstream-58b26b60d338e757f3dd88742a3166a80404d8f0.tar.gz upstream-58b26b60d338e757f3dd88742a3166a80404d8f0.tar.bz2 upstream-58b26b60d338e757f3dd88742a3166a80404d8f0.zip | |
update e2fsprogs
Update e2fsprogs to the last upstream version 1.42.
blkid works fine without 100_add_missing_libpthread_for_blkid.patch.
Signed-off-by: Luka Perkov <openwrt@lukaperkov.net>
SVN-Revision: 30535
Diffstat (limited to 'package/e2fsprogs/patches')
3 files changed, 37 insertions, 11 deletions
diff --git a/package/e2fsprogs/patches/000-uclibc_compile_fix.patch b/package/e2fsprogs/patches/000-uclibc_compile_fix.patch new file mode 100644 index 0000000000..a2e8e428e1 --- /dev/null +++ b/package/e2fsprogs/patches/000-uclibc_compile_fix.patch @@ -0,0 +1,15 @@ +Without this patch compiling e2fsprogs 1.42 fails in the case the linux +kernel headers provide linux/falloc.h but the libc is not implementing +fallocate() as it is still the case with latest versions of uClibc. + +--- a/lib/ext2fs/unix_io.c ++++ b/lib/ext2fs/unix_io.c +@@ -895,7 +895,7 @@ static errcode_t unix_discard(io_channel + goto unimplemented; + #endif + } else { +-#ifdef FALLOC_FL_PUNCH_HOLE ++#if defined HAVE_FALLOCATE && defined FALLOC_FL_PUNCH_HOLE + /* + * If we are not on block device, try to use punch hole + * to reclaim free space. diff --git a/package/e2fsprogs/patches/100-upstream_fix.patch b/package/e2fsprogs/patches/100-upstream_fix.patch new file mode 100644 index 0000000000..48555a5e46 --- /dev/null +++ b/package/e2fsprogs/patches/100-upstream_fix.patch @@ -0,0 +1,22 @@ +--- a/e2fsck/pass1.c ++++ b/e2fsck/pass1.c +@@ -545,7 +545,7 @@ void e2fsck_pass1(e2fsck_t ctx) + int i; + __u64 max_sizes; + ext2_filsys fs = ctx->fs; +- ext2_ino_t ino; ++ ext2_ino_t ino = 0; + struct ext2_inode *inode; + ext2_inode_scan scan; + char *block_buf; +--- a/e2fsck/pass1b.c ++++ b/e2fsck/pass1b.c +@@ -267,7 +267,7 @@ struct process_block_struct { + static void pass1b(e2fsck_t ctx, char *block_buf) + { + ext2_filsys fs = ctx->fs; +- ext2_ino_t ino; ++ ext2_ino_t ino = 0; + struct ext2_inode inode; + ext2_inode_scan scan; + struct process_block_struct pb; diff --git a/package/e2fsprogs/patches/100_add_missing_libpthread_for_blkid.patch b/package/e2fsprogs/patches/100_add_missing_libpthread_for_blkid.patch index 9ed9ccab97..e69de29bb2 100644 --- a/package/e2fsprogs/patches/100_add_missing_libpthread_for_blkid.patch +++ b/package/e2fsprogs/patches/100_add_missing_libpthread_for_blkid.patch @@ -1,11 +0,0 @@ ---- a/lib/blkid/Makefile.in -+++ b/lib/blkid/Makefile.in -@@ -126,7 +126,7 @@ tst_types: tst_types.o blkid_types.h - - blkid: ../../misc/blkid.o libblkid.a $(DEPLIBUUID) - $(E) " LD $@" -- $(Q) $(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID) -+ $(Q) $(CC) -lpthread -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID) - - test_probe: test_probe.in Makefile - $(E) "Creating test_probe..." |