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

package/busybox: invert dependency with tar

Browse Source 
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Yann E. MORIN 2018-07-08 11:45:35 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 651a91bdde
commit f6d2c00d43
2 changed files with 2 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_TAR),tar) \
$(if $(BR2_PACKAGE_TFTPD),tftpd) \ $(if $(BR2_PACKAGE_TFTPD),tftpd) \
$(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \ $(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \
$(if $(BR2_PACKAGE_UNZIP),unzip) \ $(if $(BR2_PACKAGE_UNZIP),unzip) \

7
package/tar/tar.mk
View File

@ -8,16 +8,11 @@ TAR_VERSION = 1.29
TAR_SOURCE = tar-$(TAR_VERSION).tar.xz TAR_SOURCE = tar-$(TAR_VERSION).tar.xz
TAR_SITE = $(BR2_GNU_MIRROR)/tar TAR_SITE = $(BR2_GNU_MIRROR)/tar
# busybox installs in /bin, so we need tar to install as well in /bin # busybox installs in /bin, so we need tar to install as well in /bin
# so that it overrides the Busybox symlinks. # so that we don't end up with two different tar
TAR_CONF_OPTS = --exec-prefix=/ TAR_CONF_OPTS = --exec-prefix=/
TAR_LICENSE = GPL-3.0+ TAR_LICENSE = GPL-3.0+
TAR_LICENSE_FILES = COPYING TAR_LICENSE_FILES = COPYING
# Prefer full-blown tar over buybox's version
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
TAR_DEPENDENCIES += busybox
endif
ifeq ($(BR2_PACKAGE_ACL),y) ifeq ($(BR2_PACKAGE_ACL),y)
TAR_DEPENDENCIES += acl TAR_DEPENDENCIES += acl
TAR_CONF_OPTS += --with-posix-acls TAR_CONF_OPTS += --with-posix-acls