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

e2fsprogs: use libblkid and libuuid from util-linux for host

Browse Source 
We have a host-util-linux, so we can use it to provide libblkid and
libuuid. This makes it consistent with the target package.

Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Carlos Santos 2017-04-22 13:59:48 +02:00 committed by Thomas Petazzoni
parent a48d94b7fc
commit aab5db994c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/e2fsprogs/Config.in.host
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_HOST_E2FSPROGS config BR2_PACKAGE_HOST_E2FSPROGS
bool "host e2fsprogs" bool "host e2fsprogs"
select BR2_PACKAGE_HOST_UTIL_LINUX
help help
The EXT2/3/4 file system utilities. The EXT2/3/4 file system utilities.

13
package/e2fsprogs/e2fsprogs.mk
View File

@ -10,14 +10,21 @@ E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2F
E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet)
E2FSPROGS_LICENSE_FILES = NOTICE lib/ss/mit-sipb-copyright.h lib/et/internal.h E2FSPROGS_LICENSE_FILES = NOTICE lib/ss/mit-sipb-copyright.h lib/et/internal.h
E2FSPROGS_INSTALL_STAGING = YES E2FSPROGS_INSTALL_STAGING = YES
# Use libblkid and libuuid from util-linux for host and target packages.
# This prevents overriding them with e2fsprogs' ones, which may cause
# problems for other packages.
E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
# we don't have a host-util-linux HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux
HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf
# 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.
# Disable fuse2fs as well to avoid carrying over deps, and it's unused # Disable fuse2fs as well to avoid carrying over deps, and it's unused
HOST_E2FSPROGS_CONF_OPTS += --disable-defrag --disable-fuse2fs HOST_E2FSPROGS_CONF_OPTS = \
--disable-defrag \
--disable-fuse2fs \
--disable-libblkid \
--disable-libuuid
E2FSPROGS_CONF_OPTS = \ E2FSPROGS_CONF_OPTS = \
$(if $(BR2_STATIC_LIBS),,--enable-elf-shlibs) \ $(if $(BR2_STATIC_LIBS),,--enable-elf-shlibs) \