X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/76ed58d705e7f3892a1259abcd92882a527e7b53..d681cd0117a182ed82e4d6aee6a69e5aa3994c47:/target/linux/package/shfs/Makefile

diff --git a/target/linux/package/shfs/Makefile b/target/linux/package/shfs/Makefile
index a329bbffc..721735223 100644
--- a/target/linux/package/shfs/Makefile
+++ b/target/linux/package/shfs/Makefile
@@ -1,6 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include ../../rules.mk
 
 PKG_NAME := shfs
 PKG_VERSION := 0.35
@@ -20,7 +21,7 @@ endif
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
 
 $(PKG_BUILD_DIR)/.configured:
 	touch $@
@@ -29,6 +30,8 @@ $(PKG_BUILD_DIR)/.built:
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		ARCH="$(LINUX_KARCH)" \
+		PATH="$(TARGET_PATH)" \
 		OFLAGS="$(TARGET_CFLAGS)" \
 		CC="$(TARGET_CC)" \
 		LINKER="$(TARGET_CC)" \
@@ -40,7 +43,7 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_KMOD_SHFS):
 	install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)
-	cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.o \
+	cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.*o \
 	 $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/
 	$(RSTRIP_KMOD) $(IDIR_KMOD_SHFS)
 	$(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR)