diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-06-14 22:22:54 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-06-15 08:08:09 +0200 |
| commit | fa8f6c80c7b646b9bf757befabd28a620b083cc4 (patch) | |
| tree | eceb8b08fd656f25283fd39c8eab1f6cbee2748e | |
| parent | 29fd3c3215b7e20ca3b5dafd8551c202df04c00b (diff) | |
| download | ptxdist-fa8f6c80c7b646b9bf757befabd28a620b083cc4.tar.gz ptxdist-fa8f6c80c7b646b9bf757befabd28a620b083cc4.tar.xz | |
e2fsprogs: version bump 1.42.13 -> 1.43.1
Note: the license file was just renamed.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/e2fsprogs.in | 6 | ||||
| -rw-r--r-- | rules/e2fsprogs.make | 15 | ||||
| -rw-r--r-- | rules/host-e2fsprogs.make | 12 |
3 files changed, 17 insertions, 16 deletions
diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in index be2805f79..232d25f1e 100644 --- a/rules/e2fsprogs.in +++ b/rules/e2fsprogs.in @@ -18,12 +18,6 @@ if E2FSPROGS menu "build options " # ----------------------------------- -config E2FSPROGS_COMPRESSION - bool - prompt "compression" - help - Enable experimental compression support. - config E2FSPROGS_IMAGER bool # no prompt diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 5d07f2006..7eb7070c6 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs # # Paths and names # -E2FSPROGS_VERSION := 1.42.13 -E2FSPROGS_MD5 := bc759fc62666786f5436e2075beb3265 +E2FSPROGS_VERSION := 1.43.1 +E2FSPROGS_MD5 := 1775f3f0eed9dee1c5f39e08d1964a97 E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION) E2FSPROGS_SUFFIX := tar.gz E2FSPROGS_URL := $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)) @@ -26,7 +26,7 @@ E2FSPROGS_SOURCE := $(SRCDIR)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX) E2FSPROGS_DIR := $(BUILDDIR)/$(E2FSPROGS) E2FSPROGS_LICENSE := GPL-2.0+, LGPL-2.0+, BSD-3-Clause, MIT E2FSPROGS_LICENSE_FILES := \ - file://COPYING;md5=b48f21d765b875bd10400975d12c1ca2 \ + file://NOTICE;md5=b48f21d765b875bd10400975d12c1ca2 \ file://lib/uuid/gen_uuid.c;startline=4;endline=31;md5=697cf5d1be275fa2588beaaf2bb481bd # ---------------------------------------------------------------------------- @@ -42,18 +42,16 @@ E2FSPROGS_CONF_OPT := \ --disable-symlink-install \ --disable-symlink-build \ --disable-verbose-makecmds \ - --$(call ptx/endis,PTXCONF_E2FSPROGS_COMPRESSION)-compression \ - --enable-htree \ --enable-elf-shlibs \ --disable-bsd-shlibs \ --disable-profile \ --disable-gcov \ + --enable-hardening \ --disable-jbd-debug \ --disable-blkid-debug \ --disable-testio-debug \ --disable-libuuid \ --disable-libblkid \ - --disable-quota \ --disable-backtrace \ --$(call ptx/endis,PTXCONF_E2FSPROGS_INSTALL_DEBUGFS)-debugfs \ --$(call ptx/endis,PTXCONF_E2FSPROGS_IMAGER)-imager \ @@ -63,9 +61,14 @@ E2FSPROGS_CONF_OPT := \ --disable-e2initrd-helper \ --disable-tls \ --disable-uuidd \ + --enable-mmp \ + --enable-tdb \ + --disable-bmap-stats \ + --disable-bmap-stats-ops \ --disable-nls \ --enable-threads=posix \ --disable-rpath \ + --disable-fuse2fs \ --with-root-prefix= E2FSPROGS_MAKE_OPT := $(if $(filter 1,$(strip $(PTXDIST_VERBOSE))),V=1) diff --git a/rules/host-e2fsprogs.make b/rules/host-e2fsprogs.make index a37efc793..305618d97 100644 --- a/rules/host-e2fsprogs.make +++ b/rules/host-e2fsprogs.make @@ -27,18 +27,17 @@ HOST_E2FSPROGS_CONF_OPT := \ --disable-symlink-install \ --disable-symlink-build \ --disable-verbose-makecmds \ - --enable-compression \ - --enable-htree \ --disable-elf-shlibs \ --disable-bsd-shlibs \ --disable-profile \ --disable-gcov \ + --enable-hardening \ --disable-jbd-debug \ --disable-blkid-debug \ --disable-testio-debug \ --enable-libuuid \ --enable-libblkid \ - --disable-quota \ + --disable-backtrace \ --disable-debugfs \ --disable-imager \ --disable-resizer \ @@ -47,9 +46,14 @@ HOST_E2FSPROGS_CONF_OPT := \ --disable-e2initrd-helper \ --disable-tls \ --disable-uuidd \ + --enable-mmp \ + --enable-tdb \ + --disable-bmap-stats \ + --disable-bmap-stats-ops \ --disable-nls \ --enable-threads=posix \ - --disable-rpath + --disable-rpath \ + --disable-fuse2fs # vim: syntax=make |