diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2013-08-14 06:30:54 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-08-16 12:58:31 +0200 |
commit | 5972198b0f23ca7a248247b0c8a91e565eaa30c2 (patch) | |
tree | 3c665ef292189c9dd4579858933144ce93c77856 /meta-oe | |
parent | 893b425a9a0e431f78edd8540a187e3386d8fb06 (diff) | |
download | meta-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')
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 @@ -Upstream-Status: Submitted - -Signed-off-by: Riku Voipio <riku.voipio@linaro.org> - ---- a/include/fuse_kernel.h -+++ b/include/fuse_kernel.h -@@ -88,12 +88,7 @@ - #ifndef _LINUX_FUSE_H - #define _LINUX_FUSE_H - --#include <sys/types.h> --#define __u64 uint64_t --#define __s64 int64_t --#define __u32 uint32_t --#define __s32 int32_t --#define __u16 uint16_t -+#include <linux/types.h> - - /* - * 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 @@ -Index: fuse-2.8.6/lib/fuse.c -=================================================================== ---- fuse-2.8.6.orig/lib/fuse.c 2011-09-13 00:23:14.000000000 -0700 -+++ fuse-2.8.6/lib/fuse.c 2011-10-19 09:20:27.537099939 -0700 -@@ -3947,11 +3947,11 @@ - 11); - } - --FUSE_SYMVER(".symver fuse_exited,__fuse_exited@"); --FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@"); --FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@"); --FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@"); --FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@"); -+FUSE_SYMVER(".symver fuse_exited,__fuse_exited@FUSE_UNVERSIONED"); -+FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@FUSE_UNVERSIONED"); -+FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@FUSE_UNVERSIONED"); -+FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@FUSE_UNVERSIONED"); -+FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@FUSE_UNVERSIONED"); - FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2"); - - #endif /* __FreeBSD__ */ -Index: fuse-2.8.6/lib/fuse_mt.c -=================================================================== ---- fuse-2.8.6.orig/lib/fuse_mt.c 2011-09-13 00:23:14.000000000 -0700 -+++ fuse-2.8.6/lib/fuse_mt.c 2011-10-19 09:20:27.537099939 -0700 -@@ -113,4 +113,4 @@ - return fuse_session_loop_mt(fuse_get_session(f)); - } - --FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@"); -+FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@FUSE_UNVERSIONED"); -Index: fuse-2.8.6/lib/fuse_versionscript -=================================================================== ---- fuse-2.8.6.orig/lib/fuse_versionscript 2011-09-13 00:23:14.000000000 -0700 -+++ fuse-2.8.6/lib/fuse_versionscript 2011-10-19 09:20:27.541099939 -0700 -@@ -1,3 +1,6 @@ -+FUSE_UNVERSIONED { -+}; -+ - FUSE_2.2 { - global: - fuse_destroy; -Index: fuse-2.8.6/lib/helper.c -=================================================================== ---- fuse-2.8.6.orig/lib/helper.c 2011-09-13 00:23:14.000000000 -0700 -+++ fuse-2.8.6/lib/helper.c 2011-10-19 09:20:27.541099939 -0700 -@@ -409,10 +409,10 @@ - return fuse_mount_compat22(mountpoint, NULL); - } - --FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@"); -+FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@FUSE_UNVERSIONED"); - FUSE_SYMVER(".symver fuse_setup_compat22,fuse_setup@FUSE_2.2"); --FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@"); --FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@"); -+FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@FUSE_UNVERSIONED"); -+FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@FUSE_UNVERSIONED"); - FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2"); - - #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 @@ -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=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" - -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz \ - file://gold-unversioned-symbol.patch \ - file://aarch64.patch \ -" -SRC_URI[md5sum] = "7d80d0dc9cc2b9199a0c53787c151205" -SRC_URI[sha256sum] = "81a728fb3f87da33063068735e2fb7e2cd89df207d32687d3d3278385279cefc" - -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" - -do_install_append() { - rm -rf ${D}${base_prefix}/dev -} |