From 273f23a452527859605be496992a65f28e3ee7c0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:53 +0200 Subject: [PATCH] package/busybox: invert dependency with kmod Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/kmod/kmod.mk | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 95fea18b50..812de14ad0 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_KMOD),kmod) \ $(if $(BR2_PACKAGE_LESS),less) \ $(if $(BR2_PACKAGE_LSOF),lsof) \ $(if $(BR2_PACKAGE_MTD),mtd) \ diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index e1149b7b65..7c796ab19f 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -49,9 +49,6 @@ ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y) KMOD_LICENSE := $(KMOD_LICENSE), GPL-2.0+ (tools) KMOD_LICENSE_FILES += COPYING -# take precedence over busybox implementation -KMOD_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox) - # /sbin is really /usr/sbin with merged /usr, so adjust relative symlink ifeq ($(BR2_ROOTFS_MERGED_USR),y) KMOD_BIN_PATH = ../bin/kmod -- 2.30.2