summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2012-01-26 16:51:29 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-01-26 21:24:11 (GMT)
commitf8a117435a184e77102fdb64f1698d35d519a6f6 (patch)
treead0cde8973f33fc130d14980a156fc89ecfe641f
parente4280ff8f05735be43bb2a624d33e9e8deba3164 (diff)
downloadbuildroot-f8a117435a184e77102fdb64f1698d35d519a6f6.tar.gz
buildroot-f8a117435a184e77102fdb64f1698d35d519a6f6.tar.bz2
e2fsprogs: bump to version 1.42
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/e2fsprogs/Config.in3
-rw-r--r--package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch (renamed from package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch)0
-rw-r--r--package/e2fsprogs/e2fsprogs-fallocate.patch22
-rw-r--r--package/e2fsprogs/e2fsprogs-sem-init-libs.patch (renamed from package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch)0
-rw-r--r--package/e2fsprogs/e2fsprogs.mk3
5 files changed, 27 insertions, 1 deletions
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index a98c49e..d4f4405 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -47,6 +47,9 @@ config BR2_PACKAGE_E2FSPROGS_E2UNDO
bool "e2undo"
default y
+config BR2_PACKAGE_E2FSPROGS_E4DEFRAG
+ bool "e4defrag"
+
config BR2_PACKAGE_E2FSPROGS_FILEFRAG
bool "filefrag"
default y
diff --git a/package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch b/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch
index 3a60e89..3a60e89 100644
--- a/package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch
+++ b/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch
diff --git a/package/e2fsprogs/e2fsprogs-fallocate.patch b/package/e2fsprogs/e2fsprogs-fallocate.patch
new file mode 100644
index 0000000..4d952a5
--- /dev/null
+++ b/package/e2fsprogs/e2fsprogs-fallocate.patch
@@ -0,0 +1,22 @@
+We assume that fallocate is supported somehow
+but we need to check if we have fallocate()
+this problem shows up on uclibc systems since
+uclibc does not have fallocate() implemented
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c
+===================================================================
+--- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c 2012-01-17 17:24:34.290780625 -0800
++++ e2fsprogs-1.42/lib/ext2fs/unix_io.c 2012-01-17 17:25:37.338783680 -0800
+@@ -895,7 +895,7 @@
+ goto unimplemented;
+ #endif
+ } else {
+-#ifdef FALLOC_FL_PUNCH_HOLE
++#if defined FALLOC_FL_PUNCH_HOLE && defined HAVE_FALLOCATE
+ /*
+ * If we are not on block device, try to use punch hole
+ * to reclaim free space.
diff --git a/package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch b/package/e2fsprogs/e2fsprogs-sem-init-libs.patch
index 56f1cc2..56f1cc2 100644
--- a/package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch
+++ b/package/e2fsprogs/e2fsprogs-sem-init-libs.patch
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index d945a12..912deab 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -4,7 +4,7 @@
#
#############################################################
-E2FSPROGS_VERSION = 1.41.14
+E2FSPROGS_VERSION = 1.42
E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
E2FSPROGS_CONF_OPT = \
@@ -39,6 +39,7 @@ E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FREEFRAG) += usr/sbin/e2freefrag
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FSCK) += usr/sbin/e2fsck
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2LABEL) += usr/sbin/e2label
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2UNDO) += usr/sbin/e2undo
+E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E4DEFRAG) += usr/sbin/e4defrag
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FILEFRAG) += usr/sbin/filefrag
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FSCK) += usr/sbin/fsck
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LOGSAVE) += usr/sbin/logsave