diff options
| -rw-r--r-- | patches/e2fsprogs-1.42.10/0001-configure-includes-are-needed-for-host-tools-when-cr.patch | 23 | ||||
| -rw-r--r-- | patches/e2fsprogs-1.42.10/0002-e2fsck-fix-Makefile-dependency-for-quota.o.patch | 27 | ||||
| -rwxr-xr-x | patches/e2fsprogs-1.42.10/autogen.sh | 2 | ||||
| -rw-r--r-- | patches/e2fsprogs-1.42.10/series | 5 | ||||
| -rw-r--r-- | rules/e2fsprogs.make | 6 | ||||
| -rw-r--r-- | rules/host-e2fsprogs.make | 2 |
6 files changed, 4 insertions, 61 deletions
diff --git a/patches/e2fsprogs-1.42.10/0001-configure-includes-are-needed-for-host-tools-when-cr.patch b/patches/e2fsprogs-1.42.10/0001-configure-includes-are-needed-for-host-tools-when-cr.patch deleted file mode 100644 index 363c66fa8..000000000 --- a/patches/e2fsprogs-1.42.10/0001-configure-includes-are-needed-for-host-tools-when-cr.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Mon, 16 Jun 2014 15:29:58 +0200 -Subject: [PATCH] configure: includes are needed for host tools when - cross-compiling - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 6592e707512e..3194ccbfdf9c 100644 ---- a/configure.in -+++ b/configure.in -@@ -1328,7 +1328,7 @@ if test $cross_compiling = no; then - BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H" - BUILD_LDFLAGS="$LDFLAGS" - else -- BUILD_CFLAGS= -+ BUILD_CFLAGS='-I. -I$(top_builddir)/lib -I$(top_srcdir)/lib' - BUILD_LDFLAGS= - fi - AC_SUBST(BUILD_CFLAGS) diff --git a/patches/e2fsprogs-1.42.10/0002-e2fsck-fix-Makefile-dependency-for-quota.o.patch b/patches/e2fsprogs-1.42.10/0002-e2fsck-fix-Makefile-dependency-for-quota.o.patch deleted file mode 100644 index 44be9f5fd..000000000 --- a/patches/e2fsprogs-1.42.10/0002-e2fsck-fix-Makefile-dependency-for-quota.o.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Theodore Ts'o <tytso@mit.edu> -Date: Thu, 22 May 2014 18:52:27 -0400 -Subject: [PATCH] e2fsck: fix Makefile dependency for quota.o - -Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> ---- - e2fsck/Makefile.in | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in -index 4b10f6fdd8dc..f773feafb72d 100644 ---- a/e2fsck/Makefile.in -+++ b/e2fsck/Makefile.in -@@ -552,3 +552,13 @@ logfile.o: $(srcdir)/logfile.c $(top_builddir)/lib/config.h \ - $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \ - $(top_srcdir)/lib/../e2fsck/dict.h - prof_err.o: prof_err.c -+quota.o: $(srcdir)/quota.c $(top_builddir)/lib/config.h \ -+ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ -+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ -+ $(top_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -+ $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/quotaio.h \ -+ $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \ -+ $(top_srcdir)/lib/../e2fsck/dict.h $(srcdir)/problem.h diff --git a/patches/e2fsprogs-1.42.10/autogen.sh b/patches/e2fsprogs-1.42.10/autogen.sh deleted file mode 100755 index c08327247..000000000 --- a/patches/e2fsprogs-1.42.10/autogen.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -autoreconf diff --git a/patches/e2fsprogs-1.42.10/series b/patches/e2fsprogs-1.42.10/series deleted file mode 100644 index 793e9929f..000000000 --- a/patches/e2fsprogs-1.42.10/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-configure-includes-are-needed-for-host-tools-when-cr.patch -0002-e2fsck-fix-Makefile-dependency-for-quota.o.patch -# e5ee2e2de3886f3ce2acba150658aa2d - git-ptx-patches magic diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index be8b71d70..decfee0a8 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs # # Paths and names # -E2FSPROGS_VERSION := 1.42.10 -E2FSPROGS_MD5 := 62bfe2fe0a194c5c37165789ac2825a8 +E2FSPROGS_VERSION := 1.42.11 +E2FSPROGS_MD5 := 412acbbd64a866c2ed1c729deaf4ae7c E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION) E2FSPROGS_SUFFIX := tar.gz E2FSPROGS_URL := $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)) @@ -45,7 +45,6 @@ E2FSPROGS_CONF_OPT := \ --disable-bsd-shlibs \ --disable-profile \ --disable-gcov \ - --disable-checker \ --disable-jbd-debug \ --disable-blkid-debug \ --disable-testio-debug \ @@ -62,6 +61,7 @@ E2FSPROGS_CONF_OPT := \ --disable-tls \ --disable-uuidd \ --disable-nls \ + --enable-threads=posix \ --disable-rpath \ --with-root-prefix= diff --git a/rules/host-e2fsprogs.make b/rules/host-e2fsprogs.make index d59af12ae..a37efc793 100644 --- a/rules/host-e2fsprogs.make +++ b/rules/host-e2fsprogs.make @@ -33,7 +33,6 @@ HOST_E2FSPROGS_CONF_OPT := \ --disable-bsd-shlibs \ --disable-profile \ --disable-gcov \ - --disable-checker \ --disable-jbd-debug \ --disable-blkid-debug \ --disable-testio-debug \ @@ -49,6 +48,7 @@ HOST_E2FSPROGS_CONF_OPT := \ --disable-tls \ --disable-uuidd \ --disable-nls \ + --enable-threads=posix \ --disable-rpath # vim: syntax=make |