X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fshfs%2FMakefile;h=69f8d83a467ea6d8a2053d93cf786a55ec02f11f;hb=4e00d98efdec5bb2e6e19eccf85fcf9a0eecb646;hp=e40994da2ab06b6e7ec3d022aba01a0747e12f7d;hpb=d9b7db100d0ab84be3c30c7c1c1f3ac4a6651ec8;p=openwrt-10.03%2F.git

diff --git a/package/shfs/Makefile b/package/shfs/Makefile
index e40994da2..69f8d83a4 100644
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@@ -1,51 +1,56 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/package/kernel.mk
 
-PKG_NAME := shfs
-PKG_VERSION := 0.35
-PKG_RELEASE := 2
-PKG_MD5SUM := 016f49d71bc32eee2b5d11fc1600cfbe
+PKG_NAME:=shfs
+PKG_VERSION:=0.35
+PKG_RELEASE:=2
+PKG_MD5SUM:=016f49d71bc32eee2b5d11fc1600cfbe
 
-PKG_SOURCE_URL := @SF/shfs
-PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT := zcat
-PKG_SOURCE_DIR := 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=@SF/shfs
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
 
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,SHFS_UTILS,shfs-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built: 
+define Package/kmod-shfs
+SECTION:=drivers
+CATEGORY:=Drivers
+DEPENDS:=
+TITLE:=Shell FileSystem (ShFS)
+DESCRIPTION:=Shell FileSystem (ShFS) \\\
+ShFS is a simple and easy to use Linux kernel module which allows you to \\\
+mount remote filesystems using a plain shell (SSH) connection. When using \\\
+ShFS, you can access all remote files just like the local ones, only the \\\
+access is governed through the transport security of SSH.
+URL:=http://shfs.sourceforge.net/
+VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+endef
+
+define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		PATH="$(TARGET_PATH)" \
 		OFLAGS="$(TARGET_CFLAGS)" \
 		CC="$(TARGET_CC)" \
 		LINKER="$(TARGET_CC)" \
 		KERNEL="$(LINUX_VERSION)" \
 		KERNEL_SOURCES="$(LINUX_DIR)" \
-		all install
-	touch $@
-
-$(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 \
-	 $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/
-	$(RSTRIP_KMOD) $(IDIR_KMOD_SHFS)
-	$(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR)
-
-$(IPKG_SHFS_UTILS):
-	install -m0755 -d $(IDIR_SHFS_UTILS)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/shfs{,u}mount $(IDIR_SHFS_UTILS)/usr/sbin/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/mount.shfs $(IDIR_SHFS_UTILS)/usr/sbin/
-	$(RSTRIP) $(IDIR_SHFS_UTILS)
-	$(IPKG_BUILD) $(IDIR_SHFS_UTILS) $(PACKAGE_DIR)
+		ROOT="$(PKG_INSTALL_DIR)" \
+		module module-install
+endef
+
+define Package/kmod-shfs/install
+	install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION)
+	$(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX) \
+		$(1)/lib/modules/$(LINUX_VERSION)/
+endef
 
+$(eval $(call BuildPackage,kmod-shfs))