diff options
author | Zoltan Kuscsik <zoltan.kuscsik@linaro.org> | 2016-07-04 08:15:04 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-07-29 11:00:53 +0200 |
commit | 37e1dd154b8516966fee5d01b689d2abf5fe0679 (patch) | |
tree | a7ff0ac5a941a19ea856b4c5ed587d7098eb0908 | |
parent | 20df863070afb02012124299c9f8547a82373825 (diff) | |
download | meta-openembedded-37e1dd154b8516966fee5d01b689d2abf5fe0679.tar.gz |
sshfs-fuse: update to 2.8
Update SRC_URI, upstream project was
moved from SF to github.
Fix building issue when build and source
directory differs.
Signed-off-by: Zoltan Kuscsik <zoltan.kuscsik@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch | 32 | ||||
-rw-r--r-- | meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb (renamed from meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.5.bb) | 9 |
2 files changed, 36 insertions, 5 deletions
diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch b/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch new file mode 100644 index 000000000..c434a03f0 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From e3cd445a4ee44a16faa646d7b642d02eea62b1f8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zoltan Kuscsik <zoltan.kuscsik@linaro.org> | ||
3 | Date: Fri, 1 Jul 2016 09:30:31 +0200 | ||
4 | Subject: [PATCH] Makefile: fix path for sshfs.1 | ||
5 | |||
6 | Fix source path when build directory differs | ||
7 | from the source dir. | ||
8 | |||
9 | Upstream-Status: Accepted | ||
10 | |||
11 | https://github.com/libfuse/sshfs/pull/24 | ||
12 | |||
13 | --- | ||
14 | Makefile.am | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/Makefile.am b/Makefile.am | ||
18 | index f003bae..3d8f9cb 100644 | ||
19 | --- a/Makefile.am | ||
20 | +++ b/Makefile.am | ||
21 | @@ -24,7 +24,7 @@ sshfs.1: sshfs.1.in | ||
22 | $(AM_V_GEN)sed \ | ||
23 | -e 's,__IDMAP_DEFAULT__,$(IDMAP_DEFAULT),g' \ | ||
24 | -e 's,__UNMOUNT_COMMAND__,$(UNMOUNT_COMMAND),g' \ | ||
25 | - <sshfs.1.in >sshfs.1.tmp || exit 1; \ | ||
26 | + <$(srcdir)/sshfs.1.in >sshfs.1.tmp || exit 1; \ | ||
27 | mv sshfs.1.tmp sshfs.1 | ||
28 | |||
29 | if SSH_NODELAY_SO | ||
30 | -- | ||
31 | 1.9.1 | ||
32 | |||
diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.5.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb index c54cfcbd2..64ccdace1 100644 --- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.5.bb +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb | |||
@@ -6,12 +6,11 @@ LICENSE = "GPLv2" | |||
6 | DEPENDS = "glib-2.0 fuse" | 6 | DEPENDS = "glib-2.0 fuse" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
8 | 8 | ||
9 | SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${BP}.tar.gz" | 9 | SRC_URI = "git://github.com/libfuse/sshfs;tag=b2fa7593586b141298e6159f40f521d2b0f4f894 \ |
10 | S = "${WORKDIR}/${BP}" | 10 | file://0001-Makefile-fix-path-for-sshfs.1.patch" |
11 | |||
12 | S = "${WORKDIR}/git" | ||
11 | 13 | ||
12 | inherit autotools pkgconfig | 14 | inherit autotools pkgconfig |
13 | 15 | ||
14 | FILES_${PN} += "${libdir}/sshnodelay.so" | 16 | FILES_${PN} += "${libdir}/sshnodelay.so" |
15 | |||
16 | SRC_URI[md5sum] = "17494910db8383a366b1301e5f5148a9" | ||
17 | SRC_URI[sha256sum] = "e9171452e5d0150b9c6a2158fd2e2dcefb5d5d03ba4d208949e00a3a46c6e63e" | ||