rootfs_split fixes

[openwrt.git] / package / shfs / Makefile

diff --git a/package/shfs/Makefile b/package/shfs/Makefile
index 3f958ad..24bf094 100644 (file)
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@@ -12,38 +12,50 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=shfs
 PKG_VERSION:=0.35
 PKG_RELEASE:=2
-PKG_MD5SUM:=016f49d71bc32eee2b5d11fc1600cfbe
 
-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_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE_URL:=@SF/shfs
+PKG_MD5SUM:=016f49d71bc32eee2b5d11fc1600cfbe
 
 include $(INCLUDE_DIR)/package.mk
 
-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)
+define Package/shfs/Default
+  TITLE:=ShFS
+  DESCRIPTION:=\
+       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/
+endef
+
+define KernelPackage/shfs
+  $(call Package/shfs/Default)
+  TITLE+= (kernel module)
+  DESCRIPTION+=\\\
+       \\\
+       This package contains the ShFS kernel module.
+  FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=Filesystems
+  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  AUTOLOAD:=$(call AutoLoad,40,shfs)
+endef
+
+define Package/shfs-utils
+  $(call Package/shfs/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS+=+kmod-shfs
+  TITLE+= (utilities)
+  DESCRIPTION+=\\\
+       \\\
+       This package contains the ShFS utilities.
 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)" \
@@ -51,12 +63,21 @@ define Build/Compile
                KERNEL_SOURCES="$(LINUX_DIR)" \
                ROOT="$(PKG_INSTALL_DIR)" \
                module module-install
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               OFLAGS="$(TARGET_CFLAGS)" \
+               CC="$(TARGET_CC)" \
+               LINKER="$(TARGET_CC)" \
+               KERNEL_SOURCES="$(LINUX_DIR)" \
+               ROOT="$(PKG_INSTALL_DIR)" \
+               utils utils-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)/
+define Package/shfs-utils/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/shfs{,u}mount $(1)/usr/bin/
+       $(INSTALL_DIR) $(1)/sbin
+       $(CP) $(PKG_INSTALL_DIR)/sbin/mount.shfs $(1)/sbin/
 endef
 
-$(eval $(call BuildPackage,kmod-shfs))
+$(eval $(call KernelPackage,shfs))
+$(eval $(call BuildPackage,shfs-utils))