package/busybox: invert dependency with fbset

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index aac31fdba77b5fd113c61f110775a75ded1a6d5d..a567f25231d7b28964cb1745ab6070db8688c3d5 100644 (file)
--- 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 d6ee104a22064a8c57e3e476f53c9e4a4f068100..787b4e1dca94417f6c342533e2f6f4e4b51010f3 100644 (file)
--- 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