Changeset 20291


Ignore:
Timestamp:
2010-03-18T22:41:54+01:00 (8 years ago)
Author:
bud
Message:
  • bump version to 2010.3.6 for uClibc 0.9.30.2+
  • added ntfs-3g.probe to package ntfs-3g
  • menuconfig reworked: external fuse now bool selector
  • new package ntfs-3g-utils containing all binaries except ntfs-3g, ntfs-3g.probe
File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/utils/ntfs-3g/Makefile

    r19714 r20291  
    99 
    1010PKG_NAME:=ntfs-3g 
    11 PKG_VERSION:=2010.1.16 
    12 PKG_RELEASE:=2 
     11PKG_RELEASE:=3 
     12 
     13PKG_UCLIBC_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION)) 
     14ifneq (,$(or $(findstring !0.9.29,!$(PKG_UCLIBC_VERSION)),$(findstring !0.9.30.1!,!$(PKG_UCLIBC_VERSION)!) )) 
     15        PKG_VERSION:=2010.1.16 
     16else 
     17        PKG_VERSION:=2010.3.6 
     18endif 
    1319 
    1420PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz 
    1521PKG_SOURCE_URL:=http://www.tuxera.com/opensource/ 
    16 PKG_MD5SUM:=e104c914e8d7d29ee83e63d46afbba25 
     22 
     23PKG_MD5SUM_2010.1.16:=e104c914e8d7d29ee83e63d46afbba25 
     24PKG_MD5SUM_2010.3.6:=12ce21aa044c6068a4df6e8cbd3c5cfa 
     25PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION)) 
    1726 
    1827PKG_FIXUP:=libtool 
     
    2231 
    2332define Package/ntfs-3g/common 
    24   SECTION:=utils 
    25   CATEGORY:=Utilities 
    26   URL:=http://www.ntfs-3g.org 
    27   SUBMENU:=Filesystem 
    28   TITLE:=Stable Read/Write NTFS Driver (build options) 
     33        SECTION:=utils 
     34        CATEGORY:=Utilities 
     35        URL:=http://www.tuxera.com 
     36        SUBMENU:=Filesystem 
     37        TITLE:=Stable Read/Write NTFS Driver 
     38        MAINTAINER:=Bud <wrt_buddhay@gmx.net> 
     39endef 
     40 
     41define Package/ntfs-3g 
     42        $(call Package/ntfs-3g/common) 
     43        DEPENDS:= +kmod-fuse +PACKAGE_NTFS-3G_USE_LIBFUSE:libfuse 
     44        DEPENDS+= +libpthread 
    2945endef 
    3046 
    3147define Package/ntfs-3g/description 
    32   ntfs-3g is an NTFS driver, which can create, remove, rename,  
    33   move files, directories, hard links, and streams; it can read  
    34   and write files, including streams and sparse files; it can  
    35   handle special files like symbolic links, devices, and FIFOs;  
    36   moreover it can also read transparently compressed files.  
     48Ntfs-3g is a NTFS driver, which can create, remove, rename,  
     49move files, directories, hard links, and streams. It can read  
     50and write files, including streams and sparse files. It can  
     51handle special files like symbolic links, devices, and FIFOs.  
     52Moreover it can also read transparently compressed files. 
     53 
     54Contains: 
     55 - ntfs-3g 
     56 - ntfs-3g.probe 
     57 
    3758endef 
    3859 
    39 define Package/ntfs-3g 
    40   $(call Package/ntfs-3g/common) 
    41   DEPENDS+= +LINUX_2_4:kmod-fuse24 +libpthread +LINUX_2_6:kmod-fuse 
    42   MENU:=1 
     60define Package/ntfs-3g/config 
     61config PACKAGE_NTFS-3G_USE_LIBFUSE 
     62        bool "use external FUSE library (package libfuse)" 
     63        depends PACKAGE_ntfs-3g 
     64        ---help--- 
     65        Ntfs-3g by default uses a minimalized lite version of FUSE.  
     66        If libfuse is part of your filesystem anyway (because of sshfs, owfs  
     67        etc.) it makes sense to activate this option and save some kilobytes  
     68        of space. 
    4369endef 
    4470 
    45 define Package/externalFUSE 
    46   $(call Package/ntfs-3g/common) 
    47   TITLE:=use external FUSE library (package libfuse) 
    48   DEFAULT:=n 
    49   DEPENDS+=ntfs-3g +libfuse 
     71define Package/ntfs-3g-utils 
     72        $(call Package/ntfs-3g/common) 
     73        TITLE:=ntfs-3g utilities (ntfs-3g.secaudit, ntfs-3g.usermap) 
     74        DEFAULT:=n 
     75        DEPENDS+= +ntfs-3g 
    5076endef 
    5177 
    52 define Package/externalFUSE/description 
    53   Ntfs-3g by default uses a lite version of FUSE for the ease  
    54   of use and some special features. If you'd rather like to use  
    55   the systemwide standard FUSE library activate this option [M|*]. 
     78define Package/ntfs-3g-utils/description 
     79Additional ntfs-3g utilities. Not included by default for size  
     80considerations. All binaries except ntfs-3g, ntfs-3g.probe. 
     81 
     82Currently: 
     83 - ntfs-3g.secaudit 
     84 - ntfs-3g.usermap 
     85 
    5686endef 
    5787 
    5888CONFIGURE_ARGS += \ 
    5989        --enable-shared \ 
    60         --enable-static \ 
     90        --enable-static 
    6191 
    6292# insert config with external libfuse 
    63 ifdef CONFIG_PACKAGE_externalFUSE     
    64     CONFIGURE_ARGS += --with-fuse=external \ 
    65                       CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ 
    66                       LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" 
    67     PKG_RELEASE:=$(PKG_RELEASE)-fuseext 
     93ifdef CONFIG_PACKAGE_NTFS-3G_USE_LIBFUSE 
     94        CONFIGURE_ARGS += --with-fuse=external  
     95        PKG_RELEASE:=$(PKG_RELEASE)-fuseext 
    6896else 
    69     CONFIGURE_ARGS += --with-fuse=internal 
    70     PKG_RELEASE:=$(PKG_RELEASE)-fuseint 
     97        CONFIGURE_ARGS += --with-fuse=internal 
     98        TARGET_CPPFLAGS:=-I../include/fuse-lite $(TARGET_CPPFLAGS)  
     99        PKG_RELEASE:=$(PKG_RELEASE)-fuseint 
    71100endif 
    72  
    73 CONFIGURE_VARS+= \ 
    74         CFLAGS="$(TARGET_CFLAGS)" \ 
    75         $(TARGET_CONFIGURE_OPTS) CPPFLAGS='' LDFLAGS='' 
    76  
    77  
    78 define Build/Configure 
    79         (cd $(PKG_BUILD_DIR) ;  \ 
    80                 $(TARGET_CONFIGURE_OPTS) \ 
    81                 CFLAGS="$(TARGET_CFLAGS)" \ 
    82                 ./configure \ 
    83                         $(CONFIGURE_ARGS) \ 
    84         ) 
    85 endef 
    86  
    87 MAKE_ARGS += ARCH="$(LINUX_KARCH)" \ 
    88              CROSS_COMPILE="$(TARGET_CROSS)" 
    89101 
    90102define Build/InstallDev 
     
    97109define Package/ntfs-3g/install 
    98110        $(INSTALL_DIR) $(1)/usr/bin 
    99         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ntfs-3g $(1)/usr/bin/ 
     111        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ntfs-3g{,.probe} $(1)/usr/bin/ 
    100112        $(INSTALL_DIR) $(1)/usr/lib 
    101113        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.so.* $(1)/usr/lib/ 
    102114endef 
    103115 
    104 # order matters!!! else a probably missing fuse lib might not be build beforehand 
    105 $(eval $(call BuildPackage,externalFUSE)) 
     116define Package/ntfs-3g-utils/install 
     117        $(INSTALL_DIR) $(1)/usr/bin 
     118        $(FIND) $(PKG_INSTALL_DIR)/usr/bin/ -type f ! -name ntfs-3g.probe ! -name ntfs-3g -exec $(INSTALL_BIN) {} $(1)/usr/bin/ \; 
     119endef 
     120 
    106121$(eval $(call BuildPackage,ntfs-3g)) 
     122$(eval $(call BuildPackage,ntfs-3g-utils)) 
    107123 
Note: See TracChangeset for help on using the changeset viewer.