diff options
| author | Mirko Vogt <mirko@openwrt.org> | 2012-04-28 19:54:54 +0000 |
|---|---|---|
| committer | Mirko Vogt <mirko@openwrt.org> | 2012-04-28 19:54:54 +0000 |
| commit | d0d93794e9ec9287ebe5f22e26dc61b9b24c8bdb (patch) | |
| tree | fb3862d0ce524a6fb16034f9b2bfb5443224442c /package/e2fsprogs/patches | |
| parent | 2181972fae818243769ba00bda1a80e3539d9985 (diff) | |
| download | upstream-d0d93794e9ec9287ebe5f22e26dc61b9b24c8bdb.tar.gz upstream-d0d93794e9ec9287ebe5f22e26dc61b9b24c8bdb.tar.bz2 upstream-d0d93794e9ec9287ebe5f22e26dc61b9b24c8bdb.zip | |
[packages/{e2fsprogs,util-linux,util-linux-ng}] update/rename those packages
This patch makes several changes to the util-linux(-ng) package:
* rename to util-linux (official name now, util-linux-ng got merged)
* bump to last stable version 2.21.1 (was 2.13.0.1 before)
* add several new packages
* sort packages within Makefile
* remove patches which got merged upstream
This patch makes some changes to the e2fsprogs package:
* bump to last stable version 1.42.2
* libraries moved from e2fsprogs to util-linux - take care of that
Signed-off-by: Luka Perkov <openwrt@lukaperkov.net>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31499 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/e2fsprogs/patches')
| -rw-r--r-- | package/e2fsprogs/patches/000-uclibc_compile_fix.patch | 15 | ||||
| -rw-r--r-- | package/e2fsprogs/patches/100-upstream_fix.patch | 22 |
2 files changed, 0 insertions, 37 deletions
diff --git a/package/e2fsprogs/patches/000-uclibc_compile_fix.patch b/package/e2fsprogs/patches/000-uclibc_compile_fix.patch deleted file mode 100644 index a2e8e428e1..0000000000 --- a/package/e2fsprogs/patches/000-uclibc_compile_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 48555a5e46..0000000000 --- a/package/e2fsprogs/patches/100-upstream_fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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; |