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>
This commit is contained in:
Adrian Bunk 2019-05-07 23:37:26 +03:00 committed by Khem Raj
parent 8605e8a437
commit f61d9b3fd3
2 changed files with 3 additions and 35 deletions

View File

@ -1,32 +0,0 @@
From e3cd445a4ee44a16faa646d7b642d02eea62b1f8 Mon Sep 17 00:00:00 2001
From: Zoltan Kuscsik <zoltan.kuscsik@linaro.org>
Date: Fri, 1 Jul 2016 09:30:31 +0200
Subject: [PATCH] Makefile: fix path for sshfs.1
Fix source path when build directory differs
from the source dir.
Upstream-Status: Accepted
https://github.com/libfuse/sshfs/pull/24
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index f003bae..3d8f9cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ sshfs.1: sshfs.1.in
$(AM_V_GEN)sed \
-e 's,__IDMAP_DEFAULT__,$(IDMAP_DEFAULT),g' \
-e 's,__UNMOUNT_COMMAND__,$(UNMOUNT_COMMAND),g' \
- <sshfs.1.in >sshfs.1.tmp || exit 1; \
+ <$(srcdir)/sshfs.1.in >sshfs.1.tmp || exit 1; \
mv sshfs.1.tmp sshfs.1
if SSH_NODELAY_SO
--
1.9.1

View File

@ -6,9 +6,9 @@ LICENSE = "GPLv2"
DEPENDS = "glib-2.0 fuse"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/libfuse/sshfs;tag=b2fa7593586b141298e6159f40f521d2b0f4f894 \
file://0001-Makefile-fix-path-for-sshfs.1.patch"
SRC_URI = "git://github.com/libfuse/sshfs;branch=sshfs_2.x \
"
SRCREV = "42dfaf9a5bdc1ee429c7718e8788ca37a5763e0d"
S = "${WORKDIR}/git"
inherit autotools pkgconfig