summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/fuse
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-08-14 06:30:54 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-08-16 12:58:31 +0200
commit5972198b0f23ca7a248247b0c8a91e565eaa30c2 (patch)
tree3c665ef292189c9dd4579858933144ce93c77856 /meta-oe/recipes-support/fuse
parent893b425a9a0e431f78edd8540a187e3386d8fb06 (diff)
downloadmeta-openembedded-5972198b0f23ca7a248247b0c8a91e565eaa30c2.tar.gz
fuse: move to meta-filesystems and upgrade
- Move fuse from meta-oe to meta-filesystems - Upgrade fuse to 2.9.3 [YOCTO #4178] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/fuse')
-rw-r--r--meta-oe/recipes-support/fuse/fuse-2.9.2/aarch64.patch20
-rw-r--r--meta-oe/recipes-support/fuse/fuse-2.9.2/gold-unversioned-symbol.patch60
-rw-r--r--meta-oe/recipes-support/fuse/fuse_2.9.2.bb40
3 files changed, 0 insertions, 120 deletions
diff --git a/meta-oe/recipes-support/fuse/fuse-2.9.2/aarch64.patch b/meta-oe/recipes-support/fuse/fuse-2.9.2/aarch64.patch
deleted file mode 100644
index 180f544f40..0000000000
--- a/meta-oe/recipes-support/fuse/fuse-2.9.2/aarch64.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Upstream-Status: Submitted
2
3Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
4
5--- a/include/fuse_kernel.h
6+++ b/include/fuse_kernel.h
7@@ -88,12 +88,7 @@
8 #ifndef _LINUX_FUSE_H
9 #define _LINUX_FUSE_H
10
11-#include <sys/types.h>
12-#define __u64 uint64_t
13-#define __s64 int64_t
14-#define __u32 uint32_t
15-#define __s32 int32_t
16-#define __u16 uint16_t
17+#include <linux/types.h>
18
19 /*
20 * Version negotiation:
diff --git a/meta-oe/recipes-support/fuse/fuse-2.9.2/gold-unversioned-symbol.patch b/meta-oe/recipes-support/fuse/fuse-2.9.2/gold-unversioned-symbol.patch
deleted file mode 100644
index 8ee97dff0f..0000000000
--- a/meta-oe/recipes-support/fuse/fuse-2.9.2/gold-unversioned-symbol.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1Index: fuse-2.8.6/lib/fuse.c
2===================================================================
3--- fuse-2.8.6.orig/lib/fuse.c 2011-09-13 00:23:14.000000000 -0700
4+++ fuse-2.8.6/lib/fuse.c 2011-10-19 09:20:27.537099939 -0700
5@@ -3947,11 +3947,11 @@
6 11);
7 }
8
9-FUSE_SYMVER(".symver fuse_exited,__fuse_exited@");
10-FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@");
11-FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@");
12-FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@");
13-FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@");
14+FUSE_SYMVER(".symver fuse_exited,__fuse_exited@FUSE_UNVERSIONED");
15+FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@FUSE_UNVERSIONED");
16+FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@FUSE_UNVERSIONED");
17+FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@FUSE_UNVERSIONED");
18+FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@FUSE_UNVERSIONED");
19 FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2");
20
21 #endif /* __FreeBSD__ */
22Index: fuse-2.8.6/lib/fuse_mt.c
23===================================================================
24--- fuse-2.8.6.orig/lib/fuse_mt.c 2011-09-13 00:23:14.000000000 -0700
25+++ fuse-2.8.6/lib/fuse_mt.c 2011-10-19 09:20:27.537099939 -0700
26@@ -113,4 +113,4 @@
27 return fuse_session_loop_mt(fuse_get_session(f));
28 }
29
30-FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@");
31+FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@FUSE_UNVERSIONED");
32Index: fuse-2.8.6/lib/fuse_versionscript
33===================================================================
34--- fuse-2.8.6.orig/lib/fuse_versionscript 2011-09-13 00:23:14.000000000 -0700
35+++ fuse-2.8.6/lib/fuse_versionscript 2011-10-19 09:20:27.541099939 -0700
36@@ -1,3 +1,6 @@
37+FUSE_UNVERSIONED {
38+};
39+
40 FUSE_2.2 {
41 global:
42 fuse_destroy;
43Index: fuse-2.8.6/lib/helper.c
44===================================================================
45--- fuse-2.8.6.orig/lib/helper.c 2011-09-13 00:23:14.000000000 -0700
46+++ fuse-2.8.6/lib/helper.c 2011-10-19 09:20:27.541099939 -0700
47@@ -409,10 +409,10 @@
48 return fuse_mount_compat22(mountpoint, NULL);
49 }
50
51-FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@");
52+FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@FUSE_UNVERSIONED");
53 FUSE_SYMVER(".symver fuse_setup_compat22,fuse_setup@FUSE_2.2");
54-FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@");
55-FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@");
56+FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@FUSE_UNVERSIONED");
57+FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@FUSE_UNVERSIONED");
58 FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2");
59
60 #endif /* __FreeBSD__ */
diff --git a/meta-oe/recipes-support/fuse/fuse_2.9.2.bb b/meta-oe/recipes-support/fuse/fuse_2.9.2.bb
deleted file mode 100644
index b6c2a9e53f..0000000000
--- a/meta-oe/recipes-support/fuse/fuse_2.9.2.bb
+++ /dev/null
@@ -1,40 +0,0 @@
1DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
2HOMEPAGE = "http://fuse.sf.net"
3SECTION = "libs"
4LICENSE = "GPLv2 & LGPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
6 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
7
8PR = "r1"
9
10SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz \
11 file://gold-unversioned-symbol.patch \
12 file://aarch64.patch \
13"
14SRC_URI[md5sum] = "7d80d0dc9cc2b9199a0c53787c151205"
15SRC_URI[sha256sum] = "81a728fb3f87da33063068735e2fb7e2cd89df207d32687d3d3278385279cefc"
16
17inherit autotools pkgconfig
18
19EXTRA_OECONF = "--disable-kernel-module"
20
21PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg"
22
23RRECOMMENDS_${PN} = "kernel-module-fuse"
24
25FILES_${PN} += "${libdir}/libfuse.so.*"
26FILES_${PN}-dev += "${libdir}/libfuse*.la"
27
28FILES_libulockmgr = "${libdir}/libulockmgr.so.*"
29FILES_libulockmgr-dev += "${libdir}/libulock*.la"
30FILES_libulockmgr-dbg += "${libdir}/.debug/libulock*"
31
32# Forbid auto-renaming to libfuse-utils
33FILES_fuse-utils = "${bindir} ${base_sbindir}"
34FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug"
35DEBIAN_NOAUTONAME_fuse-utils = "1"
36DEBIAN_NOAUTONAME_fuse-utils-dbg = "1"
37
38do_install_append() {
39 rm -rf ${D}${base_prefix}/dev
40}