X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e58a0e8a072ecf32b1b5b4c01ca74f349147c605..fd7d7215c62c223031426b1b84e96cd4186bd148:/package/fuse/Makefile diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 074d332fb..afdaa774c 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -10,16 +10,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=fuse -PKG_VERSION:=2.6.3 +PKG_VERSION:=2.6.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=3f4f5d07d12dedc0a3fd23472171fe94 -PKG_CAT:=zcat - -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_MD5SUM:=66bd30503df55a87b9868835ca5a45bc include $(INCLUDE_DIR)/package.mk @@ -35,7 +31,7 @@ define Package/fuse-utils $(call Package/fuse/Default) SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libfuse +kmod-fuse + DEPENDS:=+libfuse +kmod-fuse @LINUX_2_6 TITLE+= (utilities) DESCRIPTION+=\\\ \\\ @@ -45,24 +41,42 @@ endef define KernelPackage/fuse SUBMENU:=Filesystems $(call Package/fuse/Default) + DEPENDS:=@LINUX_2_6 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) + VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) + AUTOLOAD:=$(call AutoLoad,80,fuse) endef define Package/libfuse $(call Package/fuse/Default) SECTION:=libs CATEGORY:=Libraries + DEPENDS:=@LINUX_2_6 TITLE+= (library) DESCRIPTION+=\\\ \\\ This package contains the FUSE shared library, needed by other programs. endef +CONFIGURE_VARS += \ + kernsrcver="$(LINUX_VERSION)" + +CONFIGURE_ARGS += \ + --enable-shared \ + --enable-static \ + --disable-rpath \ + --enable-kernel-module \ + --enable-lib \ + --enable-util \ + --disable-example \ + --disable-auto-modprobe \ + --with-kernel="$(LINUX_DIR)" \ + --disable-mtab + define Build/Configure (cd $(PKG_BUILD_DIR); rm -f config.cache; \ touch configure.in ; \ @@ -70,39 +84,8 @@ define Build/Configure touch Makefile.in ; \ touch include/config.h.in ; \ touch configure ; \ - $(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-rpath \ - --enable-kernel-module \ - --enable-lib \ - --enable-util \ - --disable-example \ - --disable-auto-modprobe \ - --with-kernel="$(LINUX_DIR)" \ - --disable-mtab \ - ); + ) + $(call Build/Configure/Default) endef define Build/Compile @@ -110,6 +93,8 @@ define Build/Compile ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ + AM_CFLAGS="$(TARGET_CFLAGS) -DDISABLE_COMPAT=1" \ + EXTRA_DIST="" \ all install endef