diff options
| author |   Adrian Bunk <bunk@stusta.de> | 2019-05-07 23:37:26 +0300 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-05-07 13:40:30 -0700 |
| commit | f61d9b3fd32dede5f2ab2aabbf0a8fb9fa75dd98 (patch) | |
| tree | 08caa85ff60ad3e7db780e66aa0ffaadbdf461bb /meta-filesystems/recipes-filesystems | |
| parent | 8605e8a437e7a196ce127645fe0ee85ec5112c5c (diff) | |
| download | meta-openembedded-contrib-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.patch | 32 | ||||
| -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 c434a03f0f..0000000000 --- a/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch +++ /dev/null @@ -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 - 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 64ccdace18..582e218468 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" 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 |