diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-14 15:26:05 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-14 15:26:05 +0200 |
| commit | 8698670fc211c570832f2c5a261643157d910642 (patch) | |
| tree | 79067a04d0db0ec62708a18e331fe8b60a4fc402 /package/e2fsprogs/patches | |
| parent | 1c089110a33d3994fd19ec8fc169cc1cb16c98f8 (diff) | |
| parent | c8854df6c34109b16020a9f739ad71667a3f922b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/e2fsprogs/patches')
| -rw-r--r-- | package/e2fsprogs/patches/patch-lib_ext2fs_unix_io_c | 26 | ||||
| -rw-r--r-- | package/e2fsprogs/patches/patch-misc_Makefile_in | 8 |
2 files changed, 30 insertions, 4 deletions
diff --git a/package/e2fsprogs/patches/patch-lib_ext2fs_unix_io_c b/package/e2fsprogs/patches/patch-lib_ext2fs_unix_io_c new file mode 100644 index 000000000..d0f348b81 --- /dev/null +++ b/package/e2fsprogs/patches/patch-lib_ext2fs_unix_io_c @@ -0,0 +1,26 @@ +--- e2fsprogs-1.42.8.orig/lib/ext2fs/unix_io.c 2013-04-22 01:05:50.000000000 +0200 ++++ e2fsprogs-1.42.8/lib/ext2fs/unix_io.c 2013-08-14 13:31:40.000000000 +0200 +@@ -22,6 +22,9 @@ + #endif + + #include "config.h" ++#if HAVE_STDINT_H ++#include <stdint.h> ++#endif + #include <stdio.h> + #include <string.h> + #if HAVE_UNISTD_H +@@ -931,10 +934,10 @@ static errcode_t unix_discard(io_channel + + if (channel->flags & CHANNEL_FLAGS_BLOCK_DEVICE) { + #ifdef BLKDISCARD +- __uint64_t range[2]; ++ uint64_t range[2]; + +- range[0] = (__uint64_t)(block) * channel->block_size; +- range[1] = (__uint64_t)(count) * channel->block_size; ++ range[0] = (uint64_t)(block) * channel->block_size; ++ range[1] = (uint64_t)(count) * channel->block_size; + + ret = ioctl(data->dev, BLKDISCARD, &range); + #else diff --git a/package/e2fsprogs/patches/patch-misc_Makefile_in b/package/e2fsprogs/patches/patch-misc_Makefile_in index 46f2510c6..8d230b552 100644 --- a/package/e2fsprogs/patches/patch-misc_Makefile_in +++ b/package/e2fsprogs/patches/patch-misc_Makefile_in @@ -1,5 +1,5 @@ ---- e2fsprogs-1.42.4.orig/misc/Makefile.in 2012-06-04 18:49:49.000000000 +0200 -+++ e2fsprogs-1.42.4/misc/Makefile.in 2012-07-26 18:48:09.000000000 +0200 +--- e2fsprogs-1.42.8.orig/misc/Makefile.in 2013-04-22 01:05:50.000000000 +0200 ++++ e2fsprogs-1.42.8/misc/Makefile.in 2013-08-14 13:10:04.000000000 +0200 @@ -17,9 +17,6 @@ INSTALL = @INSTALL@ @IMAGER_CMT@E2IMAGE_PROG= e2image @IMAGER_CMT@E2IMAGE_MAN= e2image.8 @@ -30,7 +30,7 @@ DUMPE2FS_OBJS= dumpe2fs.o BADBLOCKS_OBJS= badblocks.o E2IMAGE_OBJS= e2image.o -@@ -63,8 +58,6 @@ PROFILED_MKE2FS_OBJS= profiled/mke2fs.o +@@ -63,8 +58,6 @@ PROFILED_MKE2FS_OBJS= profiled/mke2fs.o profiled/prof_err.o profiled/default_profile.o PROFILED_CHATTR_OBJS= profiled/chattr.o PROFILED_LSATTR_OBJS= profiled/lsattr.o @@ -39,7 +39,7 @@ PROFILED_DUMPE2FS_OBJS= profiled/dumpe2fs.o PROFILED_BADBLOCKS_OBJS= profiled/badblocks.o PROFILED_E2IMAGE_OBJS= profiled/e2image.o -@@ -78,7 +71,7 @@ PROFILED_E4DEFRAG_OBJS= profiled/e4defra +@@ -79,7 +72,7 @@ PROFILED_E4DEFRAG_OBJS= profiled/e4defra SRCS= $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c \ $(srcdir)/chattr.c $(srcdir)/lsattr.c $(srcdir)/dumpe2fs.c \ $(srcdir)/badblocks.c $(srcdir)/fsck.c $(srcdir)/util.c \ |