summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/kmod/kmod.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index e07e6019e9..3742a032dc 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -46,9 +46,16 @@ 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
+else
+KMOD_BIN_PATH = ../usr/bin/kmod
+endif
+
define KMOD_INSTALL_TOOLS
for i in depmod insmod lsmod modinfo modprobe rmmod; do \
- ln -sf ../usr/bin/kmod $(TARGET_DIR)/sbin/$$i; \
+ ln -sf $(KMOD_BIN_PATH) $(TARGET_DIR)/sbin/$$i; \
done
endef
OpenPOWER on IntegriCloud