package/busybox: invert dependency with util-linux
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Reviewed-by: Carlos Santos <casantos@datacom.com.br> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
parent
cd41a1bc22
commit
f0bc0e94ab
|
@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
|
|||
|
||||
# Packages that provide commands that may also be busybox applets:
|
||||
BUSYBOX_DEPENDENCIES = \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \
|
||||
$(if $(BR2_PACKAGE_VIM),vim) \
|
||||
$(if $(BR2_PACKAGE_WGET),wget) \
|
||||
$(if $(BR2_PACKAGE_WHOIS),whois)
|
||||
|
|
|
@ -31,12 +31,6 @@ HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf
|
|||
# We also don't want the host-python dependency
|
||||
HOST_UTIL_LINUX_CONF_OPTS = --without-python
|
||||
|
||||
# If both util-linux and busybox are selected, make certain util-linux
|
||||
# wins the fight over who gets to have their utils actually installed
|
||||
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
UTIL_LINUX_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
# Prevent the installation from attempting to move shared libraries from
|
||||
# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are
|
||||
# the same when merged usr is in use.
|
||||
|
|
Loading…
Reference in a new issue