aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong-iL Joh <yong-il.joh@windriver.com>2015-10-26 15:28:04 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2015-11-10 20:52:52 +0900
commit20c6d4cab9853cb9c51d9ecfb51f84da3ecf6c63 (patch)
treef97855766467cc8c0db86526022e84da8869ce63
parent4b4f5b0cd36ebc778e7ea63ddfbd8ac266613281 (diff)
downloadmeta-ivi-20c6d4cab9853cb9c51d9ecfb51f84da3ecf6c63.tar.gz
meta-ivi-20c6d4cab9853cb9c51d9ecfb51f84da3ecf6c63.tar.bz2
meta-ivi-20c6d4cab9853cb9c51d9ecfb51f84da3ecf6c63.zip
fuse: remove package
* it's duplicated with meta-openembedded layer Signed-off-by: Yong-iL Joh <yong-il.joh@windriver.com>
-rw-r--r--meta-ivi/recipes-support-ivi/fuse/files/aarch64.patch33
-rw-r--r--meta-ivi/recipes-support-ivi/fuse/files/gold-unversioned-symbol.patch92
-rw-r--r--meta-ivi/recipes-support-ivi/fuse/fuse_2.9.3.bb43
3 files changed, 0 insertions, 168 deletions
diff --git a/meta-ivi/recipes-support-ivi/fuse/files/aarch64.patch b/meta-ivi/recipes-support-ivi/fuse/files/aarch64.patch
deleted file mode 100644
index 050d114..0000000
--- a/meta-ivi/recipes-support-ivi/fuse/files/aarch64.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-fuse: add aarch64 support
-
-u64/u32 is not defined in sys/types.h, include linux/types.h like
-the kernel version of fuse.h does. Patch sent to upstream mailing list.
-
-Upstream-Status: Submitted
-Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- include/fuse_kernel.h | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h
-index c632b58..e804278 100644
---- 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:
---
-1.8.1.2
-
diff --git a/meta-ivi/recipes-support-ivi/fuse/files/gold-unversioned-symbol.patch b/meta-ivi/recipes-support-ivi/fuse/files/gold-unversioned-symbol.patch
deleted file mode 100644
index d47f692..0000000
--- a/meta-ivi/recipes-support-ivi/fuse/files/gold-unversioned-symbol.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-fuse: Fix linking issues with gold linker
-
-fuse has problems when linking with gold since it uses version
-scripts in a way thats so perticular to bfd ld
-
-/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc/sysroots/x86_64-linux/usr/libexec/armv5te-angstrom-linux-gnueabi/gcc/arm-angstro
-error: symbol __fuse_exited has undefined version
-| collect2: ld returned 1 exit status
-| make[1]: *** [libfuse.la] Error 1
-| make[1]: *** Waiting for unfinished jobs....
-
-For more details
-
-http://blog.flameeyes.eu/2011/06/01/gold-readiness-obstacle-2-base-versioning
-http://sources.redhat.com/bugzilla/show_bug.cgi?id=10861
-http://comments.gmane.org/gmane.comp.file-systems.fuse.devel/9524
-http://www.airs.com/blog/archives/300
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- lib/fuse.c | 10 +++++-----
- lib/fuse_mt.c | 2 +-
- lib/fuse_versionscript | 3 +++
- lib/helper.c | 6 +++---
- 4 files changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/lib/fuse.c b/lib/fuse.c
-index 067d0dc..6d27711 100644
---- a/lib/fuse.c
-+++ b/lib/fuse.c
-@@ -4873,11 +4873,11 @@ struct fuse *fuse_new_compat1(int fd, int flags,
- 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__ || __NetBSD__ */
-diff --git a/lib/fuse_mt.c b/lib/fuse_mt.c
-index f6dbe71..fd5ac23 100644
---- a/lib/fuse_mt.c
-+++ b/lib/fuse_mt.c
-@@ -119,4 +119,4 @@ int fuse_loop_mt(struct fuse *f)
- return res;
- }
-
--FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@");
-+FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@FUSE_UNVERSIONED");
-diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
-index 8d91887..de16ab2 100644
---- a/lib/fuse_versionscript
-+++ b/lib/fuse_versionscript
-@@ -1,3 +1,6 @@
-+FUSE_UNVERSIONED {
-+};
-+
- FUSE_2.2 {
- global:
- fuse_destroy;
-diff --git a/lib/helper.c b/lib/helper.c
-index b644012..c5349bf 100644
---- a/lib/helper.c
-+++ b/lib/helper.c
-@@ -436,10 +436,10 @@ int fuse_mount_compat1(const char *mountpoint, const char *args[])
- 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__ || __NetBSD__ */
---
-1.8.1.2
-
diff --git a/meta-ivi/recipes-support-ivi/fuse/fuse_2.9.3.bb b/meta-ivi/recipes-support-ivi/fuse/fuse_2.9.3.bb
deleted file mode 100644
index 83618ac..0000000
--- a/meta-ivi/recipes-support-ivi/fuse/fuse_2.9.3.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-SUMMARY = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-DESCRIPTION = "FUSE (Filesystem in Userspace) is a simple interface for userspace \
-programs to export a virtual filesystem to the Linux kernel. FUSE \
-also aims to provide a secure method for non privileged users to \
-create and mount their own filesystem implementations. \
-"
-HOMEPAGE = "http://fuse.sf.net"
-SECTION = "libs"
-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://gold-unversioned-symbol.patch \
- file://aarch64.patch \
-"
-SRC_URI[md5sum] = "33cae22ca50311446400daf8a6255c6a"
-SRC_URI[sha256sum] = "0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c"
-
-inherit autotools pkgconfig
-
-DEPENDS = "gettext-native"
-
-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
-}