fuse: update to 2.9.1

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

4 files changed, 5 insertions, 55 deletions

diff --git a/meta-oe/recipes-support/fuse/fuse-2.8.6/define_GNU_SOURCE.patch b/meta-oe/recipes-support/fuse/fuse-2.8.6/define_GNU_SOURCE.patch
deleted file mode 100644
index c673a4c63..000000000
--- a/meta-oe/recipes-support/fuse/fuse-2.8.6/define_GNU_SOURCE.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: fuse-2.8.6/util/fusermount.c
-===================================================================
---- fuse-2.8.6.orig/util/fusermount.c   2011-09-13 00:23:14.000000000 -0700
-+++ fuse-2.8.6/util/fusermount.c        2011-09-25 00:23:53.051019038 -0700
-@@ -7,6 +7,7 @@
- */
- /* This program does the mounting and unmounting of FUSE filesystems */
- 
-+#define _GNU_SOURCE
- #include <config.h>
- 
- #include "mount_util.h"
diff --git a/meta-oe/recipes-support/fuse/fuse-2.8.6/gold-unversioned-symbol.patch b/meta-oe/recipes-support/fuse/fuse-2.9.1/gold-unversioned-symbol.patch
index 8ee97dff0..8ee97dff0 100644
--- a/meta-oe/recipes-support/fuse/fuse-2.8.6/gold-unversioned-symbol.patch
+++ b/meta-oe/recipes-support/fuse/fuse-2.9.1/gold-unversioned-symbol.patch
diff --git a/meta-oe/recipes-support/fuse/fuse_2.8.5.bb b/meta-oe/recipes-support/fuse/fuse_2.8.5.bb
deleted file mode 100644
index 65b114b6d..000000000
--- a/meta-oe/recipes-support/fuse/fuse_2.8.5.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-HOMEPAGE = "http://fuse.sf.net"
-SECTION = "libs"
-LICENSE = "GPLv2&LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
-
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "8aa2fd689de00b73963620483084ae3b"
-SRC_URI[sha256sum] = "bec80e66ae8ee60dfdf67b2ca291266a45dcfe6bc20c64f3acfceaa38ed29a84"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-kernel-module"
-
-PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg"
-
-RRECOMMENDS_${PN} = "kernel-module-fuse""
-
-FILES_${PN} += "${libdir}/libfuse.so.*"
-FILES_${PN}-dev += "${libdir}/libfuse*.la"
-
-FILES_libulockmgr = "${libdir}/libulockmgr.so.*"
-FILES_libulockmgr-dev += "${libdir}/libulock*.la"
-FILES_libulockmgr-dbg += "${libdir}/.debug/libulock*"
-
-# Forbid auto-renaming to libfuse-utils
-FILES_fuse-utils = "${bindir} ${base_sbindir}"
-FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug"
-DEBIAN_NOAUTONAME_fuse-utils = "1"
-DEBIAN_NOAUTONAME_fuse-utils-dbg = "1"
diff --git a/meta-oe/recipes-support/fuse/fuse_2.8.6.bb b/meta-oe/recipes-support/fuse/fuse_2.9.1.bb
index 15e9206db..6718758a6 100644
--- a/meta-oe/recipes-support/fuse/fuse_2.8.6.bb
+++ b/meta-oe/recipes-support/fuse/fuse_2.9.1.bb
@@ -1,19 +1,15 @@
 DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
 HOMEPAGE = "http://fuse.sf.net"
 SECTION = "libs"
-LICENSE = "GPLv2&LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
-
-PR = "r1"
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz \
-           file://define_GNU_SOURCE.patch \
            file://gold-unversioned-symbol.patch \
           "
-
-SRC_URI[md5sum] = "eaa32c8cef56a981656a786f258a002a"
-SRC_URI[sha256sum] = "1ec1913e38f09b2a9ec1579e1800805b5e2c747d1dce515e316dbb665ca139d6"
+SRC_URI[md5sum] = "c646133c7bbf8ad9d2ced0888dc4a319"
+SRC_URI[sha256sum] = "51803d8224bf6adab052b340614980b28861f317c261eab1f1e9c6cf17b3dd75"
 
 inherit autotools pkgconfig