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

package/busybox: invert dependency with e2fsprogs

Browse Source 
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Yann E. MORIN 2018-07-08 11:46:04 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent ef265261cf
commit 1561592231
2 changed files with 3 additions and 8 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_E2FSPROGS),e2fsprogs) \
$(if $(BR2_PACKAGE_FBSET),fbset) \ $(if $(BR2_PACKAGE_FBSET),fbset) \
$(if $(BR2_PACKAGE_GAWK),gawk) \ $(if $(BR2_PACKAGE_GAWK),gawk) \
$(if $(BR2_PACKAGE_GREP),grep) \ $(if $(BR2_PACKAGE_GREP),grep) \

10
package/e2fsprogs/e2fsprogs.mk
View File

@ -17,12 +17,6 @@ E2FSPROGS_INSTALL_STAGING = YES
E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux
# If both e2fsprogs and busybox are selected, make certain e2fsprogs
# wins the fight over who gets to have their utils actually installed
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
E2FSPROGS_DEPENDENCIES += busybox
endif
# 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
@ -35,8 +29,8 @@ HOST_E2FSPROGS_CONF_OPTS = \
--enable-symlink-install \ --enable-symlink-install \
--disable-testio-debug --disable-testio-debug
# Set the binary directories to "/bin" and "/sbin" to override programs # Set the binary directories to "/bin" and "/sbin", as busybox does,
# installed by busybox. # so that we do not end up with two versions of e2fs tools.
E2FSPROGS_CONF_OPTS = \ E2FSPROGS_CONF_OPTS = \
--bindir=/bin \ --bindir=/bin \
--sbindir=/sbin \ --sbindir=/sbin \