From ef265261cfbd6c737faa984a7234279d0df1365e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:03 +0200 Subject: [PATCH] package/busybox: invert dependency with fbset Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/fbset/fbset.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index aac31fdba7..a567f25231 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_FBSET),fbset) \ $(if $(BR2_PACKAGE_GAWK),gawk) \ $(if $(BR2_PACKAGE_GREP),grep) \ $(if $(BR2_PACKAGE_GZIP),gzip) \ diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk index d6ee104a22..787b4e1dca 100644 --- a/package/fbset/fbset.mk +++ b/package/fbset/fbset.mk @@ -9,11 +9,6 @@ FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev FBSET_DEPENDENCIES = host-bison host-flex FBSET_LICENSE = GPL-2.0 -# Make sure full fbset wins over busybox fbset -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -FBSET_DEPENDENCIES += busybox -endif - define FBSET_BUILD_CMDS $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef