diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/ntfs-3g | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/ntfs-3g')
| -rw-r--r-- | package/ntfs-3g/Config.in | 5 | ||||
| -rw-r--r-- | package/ntfs-3g/Makefile | 25 | ||||
| -rw-r--r-- | package/ntfs-3g/ipkg/kmod-fs-ntfs-3g.control | 4 |
3 files changed, 17 insertions, 17 deletions
diff --git a/package/ntfs-3g/Config.in b/package/ntfs-3g/Config.in index 6ea9cddd0..9d2fde2d1 100644 --- a/package/ntfs-3g/Config.in +++ b/package/ntfs-3g/Config.in @@ -1,6 +1,7 @@ -config ADK_PACKAGE_KMOD_FS_NTFS_3G - prompt "kmod-fs-ntfs-3g................... Kernel driver for NTFS filesystem (rw)" +config ADK_PACKAGE_NTFS_3G + prompt "ntfs-3g................... NTFS filesystem driver with read-write support" tristate + select ADK_KPACKAGE_KMOD_FUSE_FS default n help http://www.ntfs-3g.org diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile index 70e4900b9..492e4a6dd 100644 --- a/package/ntfs-3g/Makefile +++ b/package/ntfs-3g/Makefile @@ -5,18 +5,21 @@ include ${TOPDIR}/rules.mk -PKG_NAME= kmod-fs-ntfs-3g -PKG_VERSION= 2009.3.8 +PKG_NAME= ntfs-3g +PKG_VERSION= 2009.4.4 PKG_RELEASE= 1 -PKG_MD5SUM= da67f4c651649f5a463af293c347c387 -PKG_MODULE= 1 -MASTER_SITES= http://www.ntfs-3g.org/ -DISTFILES= ntfs-3g-${PKG_VERSION}.tgz -WRKDIST= ${WRKDIR}/ntfs-3g-${PKG_VERSION} +PKG_MD5SUM= e0b5c170f088a8d82968f0a6b34d31da +PKG_DESCR:= ntfs filesystem driver with read and write support +PKG_SECTION:= sys +PKG_DEPENDS:= kmod-fuse-fs +PKG_URL:= http://www.ntfs-3g.org +PKG_SITES= http://www.ntfs-3g.org/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KMOD_FS_NTFS_3G,kmod-fs-ntfs-3g,${KERNEL_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) +$(eval $(call PKG_template,NTFS_3G,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --disable-ldconfig \ --disable-library @@ -25,8 +28,8 @@ BUILD_STYLE= auto INSTALL_STYLE= auto post-install: - ${INSTALL_DIR} ${IDIR_KMOD_FS_NTFS_3G}/{bin,sbin} - ${CP} ${WRKINST}/bin/ntfs-3g ${IDIR_KMOD_FS_NTFS_3G}/bin - ${CP} ${WRKINST}/sbin/mount.ntfs-3g ${IDIR_KMOD_FS_NTFS_3G}/sbin + ${INSTALL_DIR} ${IDIR_NTFS_3G}/{bin,sbin} + ${CP} ${WRKINST}/bin/ntfs-3g ${IDIR_NTFS_3G}/bin + ${CP} ${WRKINST}/sbin/mount.ntfs-3g ${IDIR_NTFS_3G}/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ntfs-3g/ipkg/kmod-fs-ntfs-3g.control b/package/ntfs-3g/ipkg/kmod-fs-ntfs-3g.control deleted file mode 100644 index 3397e9382..000000000 --- a/package/ntfs-3g/ipkg/kmod-fs-ntfs-3g.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: kmod-fs-ntfs-3g -Priority: optional -Section: sys -Description: ntfs filesystem driver with read and write support |