projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e4280ff)
e2fsprogs: bump to version 1.42
authorGustavo Zacarias <gustavo@zacarias.com.ar>
Thu, 26 Jan 2012 16:51:29 +0000 (13:51 -0300)
committerPeter Korsgaard <jacmet@sunsite.dk>
Thu, 26 Jan 2012 21:24:11 +0000 (22:24 +0100)
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/e2fsprogs/Config.in patch | blob | history
package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch [deleted file] patch | blob | history
package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch [deleted file] patch | blob | history
package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch [new file with mode: 0644] patch | blob
package/e2fsprogs/e2fsprogs-fallocate.patch [new file with mode: 0644] patch | blob
package/e2fsprogs/e2fsprogs-sem-init-libs.patch [new file with mode: 0644] patch | blob
package/e2fsprogs/e2fsprogs.mk patch | blob | history

diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index a98c49efa3b5ad5ab6011267c6e3d6da6eb629a6..d4f440533121e392f119d9d84c3d64d6c85ba36a 100644 (file)
--- 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-1.41.9-add-missing-dep-of-tst_uuid-o.patch
deleted file mode 100644 (file)
index 3a60e89..0000000
--- a/package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Add missing dependency of tst_uuid.o on uuid.h
-
-The missing dependency used to break parallel builds.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
-diff -Nrup e2fsprogs.orig//lib/uuid/Makefile.in e2fsprogs-1.41.14//lib/uuid/Makefile.in
---- e2fsprogs.orig//lib/uuid/Makefile.in       2010-06-14 05:07:36.000000000 +0200
-+++ e2fsprogs-1.41.14//lib/uuid/Makefile.in    2011-07-18 13:44:58.000000000 +0200
-@@ -76,7 +76,7 @@ uuid.h: $(srcdir)/uuid.h.in
- $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status
-       cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
- 
--tst_uuid.o: $(srcdir)/tst_uuid.c
-+tst_uuid.o: $(srcdir)/tst_uuid.c uuid.h
-       $(E) "  CC $@"
-       $(Q) $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
- 
diff --git a/package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch b/package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch
deleted file mode 100644 (file)
index 56f1cc2..0000000
--- a/package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- e2fsprogs-1.41.9/MCONFIG.in.orig   2009-10-07 20:25:07.000000000 +0800
-+++ e2fsprogs-1.41.9/MCONFIG.in        2009-10-07 20:21:41.000000000 +0800
-@@ -85,7 +85,7 @@
- #
- LIB = $(top_builddir)/lib
- LIBSS = $(LIB)/libss@LIB_EXT@ @PRIVATE_LIBS_CMT@ @DLOPEN_LIB@
--LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @PRIVATE_LIBS_CMT@ @SEM_INIT_LIB@
-+LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @SEM_INIT_LIB@
- LIBE2P = $(LIB)/libe2p@LIB_EXT@
- LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
- LIBUUID = @LIBUUID@ @SOCKET_LIB@
diff --git a/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch b/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch
new file mode 100644 (file)
index 0000000..3a60e89
--- /dev/null
+++ b/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch
@@ -0,0 +1,18 @@
+Add missing dependency of tst_uuid.o on uuid.h
+
+The missing dependency used to break parallel builds.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+diff -Nrup e2fsprogs.orig//lib/uuid/Makefile.in e2fsprogs-1.41.14//lib/uuid/Makefile.in
+--- e2fsprogs.orig//lib/uuid/Makefile.in       2010-06-14 05:07:36.000000000 +0200
++++ e2fsprogs-1.41.14//lib/uuid/Makefile.in    2011-07-18 13:44:58.000000000 +0200
+@@ -76,7 +76,7 @@ uuid.h: $(srcdir)/uuid.h.in
+ $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status
+       cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
+ 
+-tst_uuid.o: $(srcdir)/tst_uuid.c
++tst_uuid.o: $(srcdir)/tst_uuid.c uuid.h
+       $(E) "  CC $@"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
+ 
diff --git a/package/e2fsprogs/e2fsprogs-fallocate.patch b/package/e2fsprogs/e2fsprogs-fallocate.patch
new file mode 100644 (file)
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-sem-init-libs.patch b/package/e2fsprogs/e2fsprogs-sem-init-libs.patch
new file mode 100644 (file)
index 0000000..56f1cc2
--- /dev/null
+++ b/package/e2fsprogs/e2fsprogs-sem-init-libs.patch
@@ -0,0 +1,11 @@
+--- e2fsprogs-1.41.9/MCONFIG.in.orig   2009-10-07 20:25:07.000000000 +0800
++++ e2fsprogs-1.41.9/MCONFIG.in        2009-10-07 20:21:41.000000000 +0800
+@@ -85,7 +85,7 @@
+ #
+ LIB = $(top_builddir)/lib
+ LIBSS = $(LIB)/libss@LIB_EXT@ @PRIVATE_LIBS_CMT@ @DLOPEN_LIB@
+-LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @PRIVATE_LIBS_CMT@ @SEM_INIT_LIB@
++LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @SEM_INIT_LIB@
+ LIBE2P = $(LIB)/libe2p@LIB_EXT@
+ LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
+ LIBUUID = @LIBUUID@ @SOCKET_LIB@
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index d945a12263c0fee5b35538d531ec8858b66f6835..912deab6c65e84fe999c1a92d8c2b3f74c86f4b6 100644 (file)
--- 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