diff options
| -rw-r--r-- | abs/core/fuse/PKGBUILD | 46 | ||||
| -rw-r--r-- | abs/core/fuse/fuse.install | 14 |
2 files changed, 21 insertions, 39 deletions
diff --git a/abs/core/fuse/PKGBUILD b/abs/core/fuse/PKGBUILD index f386396..c16e6d7 100644 --- a/abs/core/fuse/PKGBUILD +++ b/abs/core/fuse/PKGBUILD @@ -1,55 +1,51 @@ -# $Id: PKGBUILD 94450 2010-10-07 10:30:45Z ronald $ +# $Id: PKGBUILD 157796 2012-04-29 15:29:44Z dreisner $ # Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse -pkgver=2.8.5 +pkgver=2.9.0 pkgrel=1 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64') url="http://fuse.sourceforge.net/" -license="GPL2" +license=('GPL2') depends=('glibc') makedepends=('pkg-config') backup=(etc/fuse.conf) -install=fuse.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'fuse.conf') options=(!libtool) -sha1sums=('862320b56d6bc4ad5e7be2b1e0b5029166aae09b' +sha1sums=('e64396d516cca55995e0a8f8dd75456fd9d9d21d' '3b42e37a741d4651099225987dc40e7f02a716ad') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-lib \ + cd "$pkgname-$pkgver" + + # fix building with glibc-2.14 + sed -i '1i#define _GNU_SOURCE' util/fusermount.c + + ./configure --prefix=/usr --libdir=/usr/lib --enable-lib \ --enable-util --bindir=/bin - make || return 1 + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$pkgname-$pkgver" - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install - # static device nodes will cause collision. - rm -rf ${pkgdir}/dev - # Remove init script in wrong path # Don't add our own for now, as fusectl fs oopses on 2.6.18 rm -rf ${pkgdir}/etc/init.d #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse - install -d ${pkgdir}/lib - mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/ || return 1 - ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver} || return 1 - ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2 || return 1 - mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/ || return 1 - ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 || return 1 - ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1 || return 1 - # install sample config file - install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf || return 1 - # Fix udev rule location - install -d -m755 "${pkgdir}/lib" - mv "${pkgdir}/etc/udev" "${pkgdir}/lib/" + install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf + + # remove udev rules (is in the udev package} + rm -rf ${pkgdir}/etc/udev + + # static device nodes are handled by udev + rm -rf ${pkgdir}/dev } diff --git a/abs/core/fuse/fuse.install b/abs/core/fuse/fuse.install deleted file mode 100644 index 595ac7c..0000000 --- a/abs/core/fuse/fuse.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - cat << 'EOM' -==> You must load the fuse kernel module to use FUSE. - -> Run 'modprobe fuse' to load the module now. - -> Add fuse to $MODULES in /etc/rc.conf to load on every boot. -==> You will need a /dev/fuse device node to use FUSE. - -> If you use udev, nothing needs to be done - -> For a static /dev, run: mknod /dev/fuse -m 0666 c 10 229 -EOM -} - -op=$1 -shift -$op $* |