standardize Makefile, add userland utils

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4821 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/shfs/Makefile b/package/shfs/Makefile
index dbaca66..1a2f7f5 100644 (file)
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@@ -12,34 +12,51 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=shfs
 PKG_VERSION:=0.35
 PKG_RELEASE:=2
 PKG_NAME:=shfs
 PKG_VERSION:=0.35
 PKG_RELEASE:=2

-PKG_MD5SUM:=016f49d71bc32eee2b5d11fc1600cfbe

 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_SOURCE_URL:=@SF/shfs

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

+PKG_SOURCE_URL:=@SF/shfs
+PKG_MD5SUM:=016f49d71bc32eee2b5d11fc1600cfbe

 PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
 PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 

+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 Package/kmod-shfs
 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)
+  $(call Package/shfs/Default)
+  SECTION:=kernel
+  CATEGORY:=Kernel drivers
+  DEPENDS:=
+  TITLE+= (kernel module)
+  DESCRIPTION+=\\\
+       \\\
+       This package contains the ShFS kernel module.
+  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+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
 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)" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \


@@ -50,6 +67,13 @@ define Build/Compile
                KERNEL_SOURCES="$(LINUX_DIR)" \
                ROOT="$(PKG_INSTALL_DIR)" \
                module module-install
                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
 endef
 
 define Package/kmod-shfs/install


@@ -58,4 +82,12 @@ define Package/kmod-shfs/install
                $(1)/lib/modules/$(LINUX_VERSION)/
 endef
 
                $(1)/lib/modules/$(LINUX_VERSION)/
 endef
 

+define Package/shfs-utils/install
+       install -m0755 -d $(1)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/shfs{,u}mount $(1)/usr/bin/
+       install -m0755 -d $(1)/sbin
+       $(CP) $(PKG_INSTALL_DIR)/sbin/mount.shfs $(1)/sbin/
+endef
+

 $(eval $(call BuildPackage,kmod-shfs))
 $(eval $(call BuildPackage,kmod-shfs))

+$(eval $(call BuildPackage,shfs-utils))