Use shfs fixes from #1530, unmark as broken

[openwrt-10.03/.git] / package / shfs / Makefile

diff --git a/package/shfs/Makefile b/package/shfs/Makefile
index f4383a3f966ec6ebd13917d8e5a27e76e179f4af..24bf094df863e3f32c38861383eb7acc36e7b943 100644 (file)
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@@ -16,10 +16,6 @@ PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/shfs
 PKG_MD5SUM:=016f49d71bc32eee2b5d11fc1600cfbe
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -33,23 +29,23 @@ define Package/shfs/Default
   URL:=http://shfs.sourceforge.net/
 endef
 
-define Package/kmod-shfs
+define KernelPackage/shfs
   $(call Package/shfs/Default)
-  SECTION:=kernel
-  CATEGORY:=Kernel drivers
-  DEPENDS:=
   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
+  DEPENDS+=+kmod-shfs
   TITLE+= (utilities)
   DESCRIPTION+=\\\
        \\\
@@ -76,18 +72,12 @@ define Build/Compile
                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)/
-endef
-
 define Package/shfs-utils/install
-       install -m0755 -d $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/shfs{,u}mount $(1)/usr/bin/
-       install -m0755 -d $(1)/sbin
+       $(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))