From f8a117435a184e77102fdb64f1698d35d519a6f6 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 26 Jan 2012 13:51:29 -0300 Subject: e2fsprogs: bump to version 1.42 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/e2fsprogs/Config.in | 3 +++ ...rogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch | 18 ------------------ .../e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch | 11 ----------- .../e2fsprogs-add-missing-dep-of-tst_uuid-o.patch | 18 ++++++++++++++++++ package/e2fsprogs/e2fsprogs-fallocate.patch | 22 ++++++++++++++++++++++ package/e2fsprogs/e2fsprogs-sem-init-libs.patch | 11 +++++++++++ package/e2fsprogs/e2fsprogs.mk | 3 ++- 7 files changed, 56 insertions(+), 30 deletions(-) delete mode 100644 package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch delete mode 100644 package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch create mode 100644 package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch create mode 100644 package/e2fsprogs/e2fsprogs-fallocate.patch create mode 100644 package/e2fsprogs/e2fsprogs-sem-init-libs.patch diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in index a98c49efa..d4f440533 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-1.41.9-add-missing-dep-of-tst_uuid-o.patch deleted file mode 100644 index 3a60e8946..000000000 --- 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) ---- -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 index 56f1cc2c1..000000000 --- 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 index 000000000..3a60e8946 --- /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) +--- +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 index 000000000..4d952a5df --- /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 + +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 index 000000000..56f1cc2c1 --- /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 d945a1226..912deab6c 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 -- cgit v1.2.3