Merged enhancements submitted by Stereo, thanks, closes #188 and #189

[openwrt/svn-archive/archive.git] / openwrt / package / shfs / Makefile

diff --git a/openwrt/package/shfs/Makefile b/openwrt/package/shfs/Makefile
index b0b02c0657ee2fec74266ebdbd037af0cff3d946..fd6f3e46d7e03a9641f5612f3274ee36be9f997c 100644 (file)
--- a/openwrt/package/shfs/Makefile
+++ b/openwrt/package/shfs/Makefile
@@ -2,51 +2,41 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := shfs
-PKG_VERSION := 0.35
-PKG_RELEASE := 2
-PKG_MD5SUM := 016f49d71bc32eee2b5d11fc1600cfbe
-
-PKG_SOURCE_SITE := @SF/shfs
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_CAT := zcat
-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
-
-I_KMOD_SHFS := $(PACKAGE_DIR)/kmod-shfs_$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-I_SHFS_UTILS := $(PACKAGE_DIR)/shfs-utils_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-
-
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-       mkdir -p $(DL_DIR)
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
-
-$(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
-       mkdir -p $(TOOL_BUILD_DIR)
-       rm -rf $(PKG_BUILD_DIR)
-       $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       $(PATCH) $(PKG_BUILD_DIR) ./patches
-       cp -fpR ./ipkg $(PKG_BUILD_DIR)/
-       chmod a+x $(PKG_BUILD_DIR)/ipkg/rules
-       touch $(PKG_BUILD_DIR)/ipkg/rules
-
-$(I_KMOD_SHFS) $(I_SHFS_UTILS): $(PKG_BUILD_DIR)/ipkg/rules
-       cd $(PKG_BUILD_DIR); \
-       TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
-       ./ipkg/rules package
-
-$(IPKG_STATE_DIR)/info/kmod-shfs.list: $(I_KMOD_SHFS)
-       $(IPKG) install $(I_KMOD_SHFS)
-
-$(IPKG_STATE_DIR)/info/shfs-utils.list: $(I_SHFS_UTILS)
-       $(IPKG) install $(I_SHFS_UTILS)
-
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/ipkg/rules
-compile: $(I_KMOD_SHFS) $(I_SHFS_UTILS)
-install: $(IPKG_STATE_DIR)/info/kmod-shfs.list $(IPKG_STATE_DIR)/info/shfs-utils.list
-
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(I_KMOD_SHFS) $(I_SHFS_UTILS)
+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_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,SHFS_UTILS,shfs-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+       touch $@
+
+$(PKG_BUILD_DIR)/.built: 
+       rm -rf $(PKG_INSTALL_DIR)
+       mkdir -p $(PKG_INSTALL_DIR)
+       $(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
+       touch $@
+
+$(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)