[ptxdist] [PATCH 04/19] e2fsprogs: version bump 1.43.4 -> 1.43.6

[Clemens Gruber]

Update configure flags and remove legacy ext4dev link and config.

Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com>
---
 projectroot/etc/mke2fs.conf |  5 -----
 rules/e2fsprogs.in          |  7 -------
 rules/e2fsprogs.make        | 11 +++++------
 rules/host-e2fsprogs.make   |  4 +++-
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/projectroot/etc/mke2fs.conf b/projectroot/etc/mke2fs.conf
index 3795b1ed6..a55289440 100644
--- a/projectroot/etc/mke2fs.conf
+++ b/projectroot/etc/mke2fs.conf
@@ -12,11 +12,6 @@
                features = 
has_journal,extents,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
                inode_size = 256
        }
-       ext4dev = {
-               features = 
has_journal,extents,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
-               inode_size = 256
-               options = test_fs=1
-       }
        small = {
                blocksize = 1024
                inode_size = 128
diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in
index 67936a97c..f4dae9dfd 100644
--- a/rules/e2fsprogs.in
+++ b/rules/e2fsprogs.in
@@ -142,13 +142,6 @@ config E2FSPROGS_INSTALL_FSCK_EXT4
        help
          Create link to fsck.ext4 program.
 
-config E2FSPROGS_INSTALL_FSCK_EXT4DEV
-       bool
-       prompt "fsck.ext4dev"
-       select E2FSPROGS_INSTALL_E2FSCK
-       help
-         Create link to fsck.ext4dev program.
-
 
 config E2FSPROGS_INSTALL_DEBUGFS
        bool
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index 5a83b3a13..c4f2e3bb8 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs
 #
 # Paths and names
 #
-E2FSPROGS_VERSION      := 1.43.4
-E2FSPROGS_MD5          := 0bd1c74f357f6e9ae2ab6fa6229b9aea
+E2FSPROGS_VERSION      := 1.43.6
+E2FSPROGS_MD5          := 94fb7105284474a71cf5dd0e03b92661
 E2FSPROGS              := e2fsprogs-$(E2FSPROGS_VERSION)
 E2FSPROGS_SUFFIX       := tar.gz
 E2FSPROGS_URL          := $(call ptx/mirror, SF, 
e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
@@ -40,6 +40,7 @@ E2FSPROGS_CONF_TOOL   := autoconf
 E2FSPROGS_CONF_OPT     := \
        $(CROSS_AUTOCONF_USR) \
        --disable-symlink-install \
+       --disable-relative-symlinks \
        --disable-symlink-build \
        --disable-verbose-makecmds \
        --enable-elf-shlibs \
@@ -68,7 +69,8 @@ E2FSPROGS_CONF_OPT    := \
        --disable-nls \
        --enable-threads=posix \
        --disable-rpath \
-       --disable-fuse2fs
+       --disable-fuse2fs \
+       --without-included-gettext
 
 E2FSPROGS_MAKE_OPT     := $(if $(filter 1,$(strip $(PTXDIST_VERBOSE))),V=1)
 E2FSPROGS_INSTALL_OPT  := install
@@ -139,9 +141,6 @@ endif
 ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT4
        @$(call install_link, e2fsprogs, e2fsck, /usr/sbin/fsck.ext4)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT4DEV
-       @$(call install_link, e2fsprogs, e2fsck, /usr/sbin/fsck.ext4dev)
-endif
 
 
 ifdef PTXCONF_E2FSPROGS_INSTALL_DEBUGFS
diff --git a/rules/host-e2fsprogs.make b/rules/host-e2fsprogs.make
index cbc5a385d..c19b7b954 100644
--- a/rules/host-e2fsprogs.make
+++ b/rules/host-e2fsprogs.make
@@ -25,6 +25,7 @@ HOST_E2FSPROGS_CONF_TOOL      := autoconf
 HOST_E2FSPROGS_CONF_OPT                := \
        $(HOST_AUTOCONF) \
        --disable-symlink-install \
+       --disable-relative-symlinks \
        --disable-symlink-build \
        --disable-verbose-makecmds \
        --disable-elf-shlibs \
@@ -53,7 +54,8 @@ HOST_E2FSPROGS_CONF_OPT               := \
        --disable-nls \
        --enable-threads=posix \
        --disable-rpath \
-       --disable-fuse2fs
+       --disable-fuse2fs \
+       --without-included-gettext
 
 # vim: syntax=make
 
-- 
2.14.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de