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

package/busybox: invert dependency with util-linux

Browse Source 
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:
Yann E. MORIN 2018-07-08 11:45:30 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent cd41a1bc22
commit f0bc0e94ab
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/busybox/busybox.mk
View File

@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
# Packages that provide commands that may also be busybox applets: # Packages that provide commands that may also be busybox applets:
BUSYBOX_DEPENDENCIES = \ BUSYBOX_DEPENDENCIES = \
$(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \
$(if $(BR2_PACKAGE_VIM),vim) \ $(if $(BR2_PACKAGE_VIM),vim) \
$(if $(BR2_PACKAGE_WGET),wget) \ $(if $(BR2_PACKAGE_WGET),wget) \
$(if $(BR2_PACKAGE_WHOIS),whois) $(if $(BR2_PACKAGE_WHOIS),whois)

6
package/util-linux/util-linux.mk
View File

@ -31,12 +31,6 @@ HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf
# We also don't want the host-python dependency # We also don't want the host-python dependency
HOST_UTIL_LINUX_CONF_OPTS = --without-python 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 # Prevent the installation from attempting to move shared libraries from
# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are # ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are
# the same when merged usr is in use. # the same when merged usr is in use.