aboutsummaryrefslogtreecommitdiff
path: root/package/e2fsprogs/e2fsprogs.mk
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2016-05-18 16:08:23 -0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-05-23 13:56:55 +0200
commit32c91623422f34619024f3e51f978195bdbe5d55 (patch)
treedc159f943b098c2746857c9352c9e3e54a587ca1 /package/e2fsprogs/e2fsprogs.mk
parentbd540fb983367f5c653c4f4894df26380eafaf25 (diff)
downloadbuildroot-32c91623422f34619024f3e51f978195bdbe5d55.tar.gz
buildroot-32c91623422f34619024f3e51f978195bdbe5d55.tar.bz2
e2fsprogs: bump to version 1.43
Add new fuse2fs option and disable it for host-e2fsprogs to avoid carrying over unused/unnecessary distro/host dependencies. Move E2FSPROGS_DEPENDENCIES to the top to avoid nasty mistakes (like resetting a previous conditional addition). License file renamed from COPYING to NOTICE. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/e2fsprogs/e2fsprogs.mk')
-rw-r--r--package/e2fsprogs/e2fsprogs.mk17
1 files changed, 12 insertions, 5 deletions
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 3de4cd4872..c1cbf715a4 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -4,17 +4,19 @@
#
################################################################################
-E2FSPROGS_VERSION = 1.42.13
+E2FSPROGS_VERSION = 1.43
E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause
-E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
+E2FSPROGS_LICENSE_FILES = NOTICE lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
E2FSPROGS_INSTALL_STAGING = YES
E2FSPROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-libs
+E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
# e4defrag doesn't build on older systems like RHEL5.x, and we don't
# need it on the host anyway.
-HOST_E2FSPROGS_CONF_OPTS += --disable-defrag
+# Disable fuse2fs as well to avoid carrying over deps, and it's unused
+HOST_E2FSPROGS_CONF_OPTS += --disable-defrag --disable-fuse2fs
E2FSPROGS_CONF_OPTS = \
$(if $(BR2_STATIC_LIBS),,--enable-elf-shlibs) \
@@ -30,6 +32,13 @@ E2FSPROGS_CONF_OPTS = \
--disable-testio-debug \
--disable-rpath
+ifeq ($(BR2_PACKAGE_E2FSPROGS_FUSE2FS),y)
+E2FSPROGS_CONF_OPTS += --enable-fuse2fs
+E2FSPROGS_DEPENDENCIES += libfuse
+else
+E2FSPROGS_CONF_OPTS += --disable-fuse2fs
+endif
+
ifeq ($(BR2_nios2),y)
E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no
endif
@@ -40,8 +49,6 @@ ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
E2FSPROGS_CONF_ENV += LIBS=-lintl
endif
-E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
-
E2FSPROGS_MAKE_OPTS = \
LDCONFIG=true