X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ae6e2dd7ee1cbbd0a152a9b4bce109f9c2dd5e8e..266ffa4ea2bcd54d508d9e3d0205438a33f8f159:/openwrt/package/fuse/Makefile?ds=inline

diff --git a/openwrt/package/fuse/Makefile b/openwrt/package/fuse/Makefile
index 869689fe6..d5e3222e5 100644
--- a/openwrt/package/fuse/Makefile
+++ b/openwrt/package/fuse/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fuse
-PKG_VERSION:=2.2.1
+PKG_VERSION:=2.4.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=250d89b9c7b6ecf531df60c67f75737d
+PKG_MD5SUM:=553bd9c5a4f3cd27f3e2b93844711e4c
 
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -16,7 +16,6 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,LIBFUSE,libfuse,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,FUSE_UTILS,fuse-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
@@ -31,33 +30,35 @@ $(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 \
-		  --enable-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 \
+			--disable-kernel-module \
+			--enable-lib \
+			--enable-util \
+			--disable-example \
+			--disable-auto-modprobe \
+			--with-kernel=$(LINUX_DIR) \
+			--disable-mtab \
 	);
 	touch $@
 
@@ -69,16 +70,9 @@ $(PKG_BUILD_DIR)/.built:
 		all install
 	touch $@
 
-$(IPKG_KMOD_FUSE):
-	mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)
-	cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.o \
-	 $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/
-	$(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR)
-
 $(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)
 
@@ -90,17 +84,25 @@ $(IPKG_FUSE_UTILS):
 
 $(STAGING_DIR)/usr/lib/libfuse.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse* $(STAGING_DIR)/usr/include/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse $(STAGING_DIR)/usr/include/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse.h $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.a $(STAGING_DIR)/usr/lib/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.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/
+	$(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
 	
 install-dev: $(STAGING_DIR)/usr/lib/libfuse.so
 
 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
+	rm -rf \
+		$(STAGING_DIR)/usr/include/fuse \
+		$(STAGING_DIR)/usr/include/fuse.h \
+		$(STAGING_DIR)/usr/lib/libfuse.a \
+		$(STAGING_DIR)/usr/lib/libfuse.so* \
+		$(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc \
 
-install: install-dev
+compile: install-dev
 clean: uninstall-dev