X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Ffuse%2FMakefile;h=0620b6cf9b6b078af90e3da7559c2da2d04392d9;hp=d310e92df220899cde7089c268081701df66250e;hb=801985e5286881dd578a19280b2a6c8e212a530d;hpb=a8c770d509becc5a4d96e46a2dc94bdee6ab6e69 diff --git a/package/fuse/Makefile b/package/fuse/Makefile index d310e92df2..0620b6cf9b 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -1,154 +1,111 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2010 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.6.1 -PKG_RELEASE:=1 +PKG_VERSION:=2.9.0 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=13e1873086a1d7a95f470bbc7428c528 -PKG_CAT:=zcat +PKG_MD5SUM:=894ee11674f89a915ae87524aed55bc4 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_LICENSE:=LGPLv2.1 GPLv2 +PKG_LICENSE_FILES:=COPYING.LIB COPYING + +PKG_INSTALL:=1 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/Default/description + FUSE (Filesystem in UserSpacE) +endef + define Package/fuse-utils - $(call Package/fuse/Default) +$(call Package/fuse/Default) SECTION:=utils CATEGORY:=Utilities + DEPENDS:=+libfuse TITLE+= (utilities) - DESCRIPTION+=\\\ - \\\ - This package contains the FUSE utilities. + SUBMENU:=Filesystem endef -define Package/kmod-fuse - $(call Package/fuse/Default) - SECTION:=kernel - CATEGORY:=Kernel drivers - TITLE+= (kernel module) - DESCRIPTION+=\\\ - \\\ - This package contains the FUSE kernel module. - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) +define Package/fuse-utils/description +$(call Package/fuse/Default/description) + This package contains the FUSE utilities. + - fusermount + - ulockmgr_server endef define Package/libfuse - $(call Package/fuse/Default) +$(call Package/fuse/Default) SECTION:=libs CATEGORY:=Libraries TITLE+= (library) - DESCRIPTION+=\\\ - \\\ - This package contains the FUSE shared library, needed by other programs. + DEPENDS:=+kmod-fuse +libpthread + SUBMENU:=Filesystem endef -define Build/Configure - (cd $(PKG_BUILD_DIR); rm -f config.cache; \ - touch configure.in ; \ - touch aclocal.m4 ; \ - 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 \ - ); +define Package/libfuse/description +$(call Package/fuse/Default/description) + This package contains the FUSE shared libraries, needed by other programs. + - libfuse + - libulockmgr endef -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - ARCH="$(LINUX_KARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install -endef +# generic args +CONFIGURE_ARGS += \ + --enable-shared \ + --enable-static \ + --disable-rpath \ + --disable-example \ + --disable-mtab + +# generic package uses lib & utils +CONFIGURE_ARGS += --enable-lib --enable-util define Build/InstallDev - mkdir -p $(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) $(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 - -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 + @echo "--> Build/InstallDev enter" + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/{fuse,*.h} $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(1)/usr/lib/pkgconfig/ + $(SED) 's,-I$$$${includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc + $(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc + @echo "--> Build/InstallDev leave" endef define Package/fuse-utils/install + @echo "--> Package/fuse-utils/install enter" $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/ + # use cp and keep fusermount sticky bit + $(FIND) $(PKG_INSTALL_DIR)/usr/bin/ -type f -exec $(CP) -a {} $(1)/usr/bin/ \; + @echo "--> Package/fuse-utils/install leave" endef -define Package/kmod-fuse/install - $(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) - $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ - $(1)/lib/modules/$(LINUX_VERSION)/ +define Package/libfuse/install + @echo "--> Package/libfuse/install enter" $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/ + @echo "--> Package/libfuse/install leave" endef -define Package/libfuse/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/ +define Package/kmod-fuse/install + @echo "--> Package/kmod-fuse/install enter/leave" endef $(eval $(call BuildPackage,fuse-utils)) -$(eval $(call BuildPackage,kmod-fuse)) $(eval $(call BuildPackage,libfuse))