NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

e2fsprogs: bump to version 1.43

Browse Source 
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>
This commit is contained in:
Gustavo Zacarias 2016-05-18 16:08:23 -03:00 committed by Thomas Petazzoni
parent bd540fb983
commit 32c9162342
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/e2fsprogs/Config.in
View File

@ -62,6 +62,15 @@ config BR2_PACKAGE_E2FSPROGS_FSCK
bool "fsck" bool "fsck"
default y default y
config BR2_PACKAGE_E2FSPROGS_FUSE2FS
bool "fuse2fs"
depends on !BR2_STATIC_LIBS # libfuse
depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
select BR2_PACKAGE_LIBFUSE
comment "fuse2fs needs a toolchain w/ threads, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
config BR2_PACKAGE_E2FSPROGS_LOGSAVE config BR2_PACKAGE_E2FSPROGS_LOGSAVE
bool "logsave" bool "logsave"
default y default y

4
package/e2fsprogs/e2fsprogs.hash
View File

@ -1,2 +1,2 @@
# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.42.13/sha256sums.asc # From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43/sha256sums.asc
sha256 e16474b5a3a30f9197160c4b91bd48d5a463583049c0fcc405b6f0f7075aa0c7 e2fsprogs-1.42.13.tar.xz sha256 d027eec0282e169eb55229beefca258c425c9d96f65292e2c004012d5353cd38 e2fsprogs-1.43.tar.xz

17
package/e2fsprogs/e2fsprogs.mk
View File

@ -4,17 +4,19 @@
# #
################################################################################ ################################################################################
E2FSPROGS_VERSION = 1.42.13 E2FSPROGS_VERSION = 1.43
E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) 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 = 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 = YES
E2FSPROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-libs 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 # e4defrag doesn't build on older systems like RHEL5.x, and we don't
# need it on the host anyway. # 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 = \ E2FSPROGS_CONF_OPTS = \
$(if $(BR2_STATIC_LIBS),,--enable-elf-shlibs) \ $(if $(BR2_STATIC_LIBS),,--enable-elf-shlibs) \
@ -30,6 +32,13 @@ E2FSPROGS_CONF_OPTS = \
--disable-testio-debug \ --disable-testio-debug \
--disable-rpath --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) ifeq ($(BR2_nios2),y)
E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no
endif endif
@ -40,8 +49,6 @@ ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
E2FSPROGS_CONF_ENV += LIBS=-lintl E2FSPROGS_CONF_ENV += LIBS=-lintl
endif endif
E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
E2FSPROGS_MAKE_OPTS = \ E2FSPROGS_MAKE_OPTS = \
LDCONFIG=true LDCONFIG=true