diff options
| author | Chris Lesiak <chris.lesiak@licor.com> | 2015-10-26 08:51:48 -0500 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-10-26 17:48:02 +0100 |
| commit | 2aca24c4d124025fcb5ab1596867e37d31855a59 (patch) | |
| tree | 53793040634a5e21abdfc2b1a59fa765eb920e17 /package/kmod | |
| parent | 23aa0b468819bc34b307ac51a4665901cf0608ad (diff) | |
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: Chris Lesiak <chris.lesiak@licor.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/kmod')
| -rw-r--r-- | package/kmod/kmod.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index e07e6019e..3742a032d 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 |