X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a546c891ad37be6eb9118153aef80d92e3e45c61..8072d81b1cb36f19719dc3c113b6eaaf4df4c255:/package/fuse/Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 30b03a8d9..66c2455e6 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -1,27 +1,69 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse
-PKG_VERSION:=2.2.1
+PKG_VERSION:=2.6.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=250d89b9c7b6ecf531df60c67f75737d
 
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+PKG_MD5SUM:=13e1873086a1d7a95f470bbc7428c528
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/fuse/Default
+  TITLE:=FUSE
+  DEPENDS:=@LINUX_2_6
+  DESCRIPTION:=\
+	FUSE (Filesystem in UserSpacE)
+  URL:=http://fuse.sourceforge.net/
+endef
+
+define Package/fuse-utils
+  $(call Package/fuse/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE+= (utilities)
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the FUSE utilities.
+endef
 
-$(eval $(call PKG_template,LIBFUSE,libfuse,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define KernelPackage/fuse
+  SUBMENU:=Filesystems
+  $(call Package/fuse/Default)
+  TITLE+= (kernel module)
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the FUSE kernel module.
+  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
+endef
 
-$(PKG_BUILD_DIR)/.configured:
-	(cd $(PKG_BUILD_DIR); \
-		rm -rf config.{cache,status} ; \
+define Package/libfuse
+  $(call Package/fuse/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= (library)
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the FUSE shared library, needed by other programs.
+endef
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
 		touch configure.in ; \
 		touch aclocal.m4 ; \
 		touch Makefile.in ; \
@@ -30,70 +72,73 @@ $(PKG_BUILD_DIR)/.configured:
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		./configure \
-		  --target=$(GNU_TARGET_NAME) \
-		  --host=$(GNU_TARGET_NAME) \
-		  --build=$(GNU_HOST_NAME) \
-		  --program-prefix="" \
-		  --program-suffix="" \
-		  --prefix=/usr \
-		  --exec-prefix=/usr \
-		  --bindir=/usr/bin \
-		  --datadir=/usr/share \
-		  --includedir=/usr/include \
-		  --infodir=/usr/share/info \
-		  --libdir=/usr/lib \
-		  --libexecdir=/usr/lib \
-		  --localstatedir=/var \
-		  --mandir=/usr/share/man \
-		  --sbindir=/usr/sbin \
-		  --sysconfdir=/etc \
-		  $(DISABLE_LARGEFILE) \
-		  $(DISABLE_NLS) \
-		  --enable-shared \
-		  --enable-static \
-		  --disable-kernel-module \
-		  --enable-lib \
-		  --enable-util \
-		  --disable-example \
-		  --disable-auto-modprobe \
-		  --with-kernel=$(LINUX_DIR) \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc \
+			$(DISABLE_LARGEFILE) \
+			$(DISABLE_NLS) \
+			--enable-shared \
+			--enable-static \
+			--disable-rpath \
+			--enable-kernel-module \
+			--enable-lib \
+			--enable-util \
+			--disable-example \
+			--disable-auto-modprobe \
+			--with-kernel="$(LINUX_DIR)" \
+			--disable-mtab \
 	);
-	touch $@
+endef
 
-$(PKG_BUILD_DIR)/.built:
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
-	touch $@
-
-$(IPKG_LIBFUSE):
-	mkdir -p $(IDIR_LIBFUSE)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/
-	chmod 0644 $(IDIR_LIBFUSE)/usr/lib/lib*.so*
-	$(RSTRIP) $(IDIR_LIBFUSE)
-	$(IPKG_BUILD) $(IDIR_LIBFUSE) $(PACKAGE_DIR)
+endef
 
-$(IPKG_FUSE_UTILS):
-	mkdir -p $(IDIR_FUSE_UTILS)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/fusermount $(IDIR_FUSE_UTILS)/usr/bin/
-	$(RSTRIP) $(IDIR_FUSE_UTILS)
-	$(IPKG_BUILD) $(IDIR_FUSE_UTILS) $(PACKAGE_DIR)
-
-$(STAGING_DIR)/usr/lib/libfuse.so: $(PKG_BUILD_DIR)/.built
+define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse* $(STAGING_DIR)/usr/include/
+	$(CP)	$(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(STAGING_DIR)/usr/lib/
 	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(STAGING_DIR)/usr/lib/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(SED) 's,-I$$$${includedir}/fuse,,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
+	$(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
+endef
 	
-install-dev: $(STAGING_DIR)/usr/lib/libfuse.so
+define Build/UninstallDev
+	rm -rf	$(STAGING_DIR)/usr/include/fuse{,.h} \
+		$(STAGING_DIR)/usr/lib/libfuse.{a,so*} \
+		$(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
+endef
+
+define Package/fuse-utils/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
+endef
 
-uninstall-dev:
-	rm -rf $(STAGING_DIR)/usr/include/fuse*
-	rm -rf $(STAGING_DIR)/usr/lib/libfuse.{a,so*}
-	rm -rf $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
+define Package/libfuse/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
+endef
 
-install: install-dev
-clean: uninstall-dev
+$(eval $(call BuildPackage,fuse-utils))
+$(eval $(call BuildPackage,libfuse))
+$(eval $(call KernelPackage,fuse))