Commit 2aca24c4 authored by Chris Lesiak's avatar Chris Lesiak Committed by Peter Korsgaard
Browse files

kmod: Fix tool links when BR2_ROOTFS_MERGED_USR 



[Peter: use KMOD_BIN_PATH instead of doubling logic, add comment explaining
	why this is needed]
Signed-off-by: default avatarChris Lesiak <chris.lesiak@licor.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 23aa0b46

package/kmod/kmod.mk

+8 −1
Original line number Diff line number Diff line
@@ -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