X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/bbe718534f63fcffe145409867ce22eacbd3734e..1aae32018f3f9223f7df0dbe9a072c1b6e8a0994:/openwrt/package/shfs/Makefile?ds=sidebyside

diff --git a/openwrt/package/shfs/Makefile b/openwrt/package/shfs/Makefile
index b0b02c065..0a9fcda75 100644
--- a/openwrt/package/shfs/Makefile
+++ b/openwrt/package/shfs/Makefile
@@ -7,46 +7,46 @@ 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_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_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)/.built: 
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+	  OFLAGS="$(TARGET_CFLAGS)" \
+	  CC="$(TARGET_CC)" \
+	  LINKER="$(TARGET_CC)" \
+	  KERNEL="$(LINUX_VERSION)" \
+	  KERNEL_SOURCES="$(LINUX_DIR)" \
+	 all
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+	  ROOT="$(PKG_INSTALL_DIR)" \
+	  KERNEL="$(LINUX_VERSION)" \
+	  KERNEL_SOURCES="$(LINUX_DIR)" \
+	 install
+	touch $(PKG_BUILD_DIR)/.built
+
+$(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)