the attached patch bumps ntfs-3g to the latest version. menuconfig
integration has been slightly modified. Also new:
- package ntfs-3g now also contains the ntfs-3g.probe binary
- new subpackage called ntfs-3g-utils contains ntfs-3g.{usermap,secaudit}Tested on brcm-2.4 and brcm-47xx. .. bud
Index: feeds/packages/utils/ntfs-3g/patches/001-xattr_include.patch =================================================================== --- feeds/packages/utils/ntfs-3g/patches/001-xattr_include.patch (Revision 0) +++ feeds/packages/utils/ntfs-3g/patches/001-xattr_include.patch (Revision 0) @@ -0,0 +1,14 @@ +--- ntfs-3g-2009.11.14/config.h.in.orig 2009-12-16 23:51:30.582000000 +0100 ++++ ntfs-3g-2009.11.14/config.h.in 2009-12-16 23:50:33.890000000 +0100 +@@ -123,6 +123,11 @@ + /* Define to 1 if you have the `setxattr' function. */ + #undef HAVE_SETXATTR + ++/* fix 'XATTR_REPLACE undeclared' compile errors */ ++#ifndef HAVE_SETXATTR ++ #include <linux/xattr.h> ++#endif ++ + /* Define to 1 if `stat' has the bug that it succeeds when given the + zero-length file name argument. */ + #undef HAVE_STAT_EMPTY_STRING_BUG Index: feeds/packages/utils/ntfs-3g/Makefile =================================================================== --- feeds/packages/utils/ntfs-3g/Makefile (Revision 19354) +++ feeds/packages/utils/ntfs-3g/Makefile (Arbeitskopie) @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,23 +8,28 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ntfs-3g -PKG_VERSION:=2009.4.4 +PKG_VERSION:=2010.1.16 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=http://www.ntfs-3g.org/ -PKG_MD5SUM:=e0b5c170f088a8d82968f0a6b34d31da +PKG_SOURCE_URL:=http://tuxera.com/opensource/ +PKG_MD5SUM:=e104c914e8d7d29ee83e63d46afbba25 include $(INCLUDE_DIR)/package.mk define Package/ntfs-3g/common - SECTION:=utils - CATEGORY:=Utilities - URL:=http://www.ntfs-3g.org - SUBMENU:=Filesystem - TITLE:=Stable Read/Write NTFS Driver (build options) + SECTION:=utils + CATEGORY:=Utilities + URL:=http://www.ntfs-3g.org + SUBMENU:=Filesystem + TITLE:=Stable Read/Write NTFS Driver (build options) endef +define Package/ntfs-3g + $(call Package/ntfs-3g/common) + DEPENDS:= +LINUX_2_4:kmod-fuse24 +libpthread +LINUX_2_6:kmod-fuse +PACKAGE_NTFS-3G_USE_LIBFUSE:libfuse +endef + define Package/ntfs-3g/description ntfs-3g is an NTFS driver, which can create, remove, rename, move files, directories, hard links, and streams; it can read @@ -33,54 +38,46 @@ moreover it can also read transparently compressed files. endef -define Package/ntfs-3g - $(call Package/ntfs-3g/common) - DEPENDS+= +LINUX_2_4:kmod-fuse24 +libpthread +LINUX_2_6:kmod-fuse - MENU:=1 +define Package/ntfs-3g/config +config PACKAGE_NTFS-3G_USE_LIBFUSE + bool "use external FUSE library (package libfuse)" + depends PACKAGE_ntfs-3g + ---help--- + Ntfs-3g by default uses a minimalized lite version of FUSE. + If libfuse is part of your filesystem anyway (because of sshfs, owfs + etc.) it makes sense to activate this option and save some kilobytes + of space. endef -define Package/externalFUSE - $(call Package/ntfs-3g/common) - TITLE:=use external FUSE library (package libfuse) - DEFAULT:=n - DEPENDS+=ntfs-3g +libfuse +define Package/ntfs-3g-utils + $(call Package/ntfs-3g/common) + TITLE:=ntfs-3g utilities (ntfs-3g.secaudit, ntfs-3g.usermap) + DEFAULT:=n + DEPENDS+= +ntfs-3g endef -define Package/externalFUSE/description - Ntfs-3g by default uses a lite version of FUSE for the ease - of use and some special features. If you'd rather like to use - the systemwide standard FUSE library activate this option [M|*]. +define Package/ntfs-3g-utils/description + Additional ntfs-3g utilities. Not included by default for size + considerations. All binaries except ntfs-3g, ntfs-3g.probe. + Currently: + - ntfs-3g.secaudit + - ntfs-3g.usermap endef CONFIGURE_ARGS += \ --enable-shared \ - --enable-static \ + --enable-static # insert config with external libfuse -ifdef CONFIG_PACKAGE_externalFUSE - CONFIGURE_ARGS += --with-fuse=external \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" - PKG_RELEASE:=$(PKG_RELEASE)-fuseext +ifdef CONFIG_PACKAGE_NTFS-3G_USE_LIBFUSE + CONFIGURE_ARGS += --with-fuse=external + PKG_RELEASE:=$(PKG_RELEASE)-fuseext else - CONFIGURE_ARGS += --with-fuse=internal - PKG_RELEASE:=$(PKG_RELEASE)-fuseint + CONFIGURE_ARGS += --with-fuse=internal + TARGET_CPPFLAGS:=-I../include/fuse-lite $(TARGET_CPPFLAGS) + PKG_RELEASE:=$(PKG_RELEASE)-fuseint endif -CONFIGURE_VARS+= \ - CFLAGS="$(TARGET_CFLAGS)" \ - $(TARGET_CONFIGURE_OPTS) CPPFLAGS='' LDFLAGS='' - - -define Build/Configure - (cd $(PKG_BUILD_DIR) ; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - ./configure \ - $(CONFIGURE_ARGS) \ - ) -endef - define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ ARCH="$(LINUX_KARCH)" \ @@ -98,12 +95,15 @@ define Package/ntfs-3g/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ntfs-3g $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ntfs-3g{,.probe} $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.so.* $(1)/usr/lib/ endef -# order matters!!! else a probably missing fuse lib might not be build beforehand -$(eval $(call BuildPackage,externalFUSE)) +define Package/ntfs-3g-utils/install + $(INSTALL_DIR) $(1)/usr/bin + $(FIND) $(PKG_INSTALL_DIR)/usr/bin/ -type f ! -name ntfs-3g.probe ! -name ntfs-3g -exec $(INSTALL_BIN) {} $(1)/usr/bin/ \; +endef + $(eval $(call BuildPackage,ntfs-3g)) - +$(eval $(call BuildPackage,ntfs-3g-utils))
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
