summaryrefslogtreecommitdiffstats
path: root/meta-filesystems/recipes-filesystems
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-07 23:37:26 +0300
committerKhem Raj <raj.khem@gmail.com>2019-05-07 13:40:30 -0700
commitf61d9b3fd32dede5f2ab2aabbf0a8fb9fa75dd98 (patch)
tree08caa85ff60ad3e7db780e66aa0ffaadbdf461bb /meta-filesystems/recipes-filesystems
parent8605e8a437e7a196ce127645fe0ee85ec5112c5c (diff)
downloadmeta-openembedded-f61d9b3fd32dede5f2ab2aabbf0a8fb9fa75dd98.tar.gz
sshfs-fuse: upgrade 2.8 -> 2.10
Remove patch applied upstream. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-filesystems/recipes-filesystems')
-rw-r--r--meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch32
-rw-r--r--meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.10.bb (renamed from meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb)6
2 files changed, 3 insertions, 35 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
deleted file mode 100644
index c434a03f0..000000000
--- a/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From e3cd445a4ee44a16faa646d7b642d02eea62b1f8 Mon Sep 17 00:00:00 2001
2From: Zoltan Kuscsik <zoltan.kuscsik@linaro.org>
3Date: Fri, 1 Jul 2016 09:30:31 +0200
4Subject: [PATCH] Makefile: fix path for sshfs.1
5
6Fix source path when build directory differs
7from the source dir.
8
9Upstream-Status: Accepted
10
11https://github.com/libfuse/sshfs/pull/24
12
13---
14 Makefile.am | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/Makefile.am b/Makefile.am
18index 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--
311.9.1
32
diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.10.bb
index 64ccdace1..582e21846 100644
--- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb
+++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.10.bb
@@ -6,9 +6,9 @@ LICENSE = "GPLv2"
6DEPENDS = "glib-2.0 fuse" 6DEPENDS = "glib-2.0 fuse"
7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
8 8
9SRC_URI = "git://github.com/libfuse/sshfs;tag=b2fa7593586b141298e6159f40f521d2b0f4f894 \ 9SRC_URI = "git://github.com/libfuse/sshfs;branch=sshfs_2.x \
10 file://0001-Makefile-fix-path-for-sshfs.1.patch" 10"
11 11SRCREV = "42dfaf9a5bdc1ee429c7718e8788ca37a5763e0d"
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
14inherit autotools pkgconfig 14inherit autotools pkgconfig