jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

efl: fix target package dependency on util-linux (libmount)

Browse Source 
Use the correct variable (BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT) and do
not impose dependency on util-linux if not needed.

Signed-off-by: Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
Reviewed-by: Romain Naour <romain.naour@gmail.com>
Tested-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Gustavo Sverzut Barbieri 2017-01-03 19:29:31 -02:00 committed by Thomas Petazzoni
parent 0bc66d3e1c
commit ef01264f13
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/efl/Config.in
View File

@ -17,9 +17,6 @@ config BR2_PACKAGE_EFL
# https://phab.enlightenment.org/T2728 # https://phab.enlightenment.org/T2728
select BR2_PACKAGE_LUAJIT # Lua support broken select BR2_PACKAGE_LUAJIT # Lua support broken
select BR2_PACKAGE_LZ4 select BR2_PACKAGE_LZ4
select BR2_PACKAGE_UTIL_LINUX
# libblkid is part of required tools, see EFL's README.
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB
help help
Enlightenment Foundation Libraries Enlightenment Foundation Libraries
@ -101,7 +98,10 @@ config BR2_PACKAGE_EFL_PULSEAUDIO
config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT
bool "Enable libmount support (recommended)" bool "Enable libmount support (recommended)"
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
# libblkid is part of required tools, see EFL's README.
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
default y default y
help help
Libmount is used heavily inside Eeze for support of removable Libmount is used heavily inside Eeze for support of removable

4
package/efl/efl.mk
View File

@ -20,7 +20,7 @@ EFL_LICENSE_FILES = \
EFL_INSTALL_STAGING = YES EFL_INSTALL_STAGING = YES
EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \ EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \
jpeg luajit lz4 udev util-linux zlib jpeg luajit lz4 udev zlib
# Configure options: # Configure options:
# --disable-lua-old: build elua for the target. # --disable-lua-old: build elua for the target.
@ -59,7 +59,7 @@ else
EFL_CONF_OPTS += --disable-cxx-bindings EFL_CONF_OPTS += --disable-cxx-bindings
endif endif
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y)
EFL_DEPENDENCIES += util-linux EFL_DEPENDENCIES += util-linux
EFL_CONF_OPTS += --enable-libmount EFL_CONF_OPTS += --enable-libmount
else else