From 37e1dd154b8516966fee5d01b689d2abf5fe0679 Mon Sep 17 00:00:00 2001 From: Zoltan Kuscsik Date: Mon, 4 Jul 2016 08:15:04 +0200 Subject: 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 Signed-off-by: Martin Jansa --- .../files/0001-Makefile-fix-path-for-sshfs.1.patch | 32 ++++++++++++++++++++++ .../sshfs-fuse/sshfs-fuse_2.5.bb | 17 ------------ .../sshfs-fuse/sshfs-fuse_2.8.bb | 16 +++++++++++ 3 files changed, 48 insertions(+), 17 deletions(-) create mode 100644 meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch delete mode 100644 meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.5.bb create mode 100644 meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb (limited to 'meta-filesystems') 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 0000000000..c434a03f0f --- /dev/null +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch @@ -0,0 +1,32 @@ +From e3cd445a4ee44a16faa646d7b642d02eea62b1f8 Mon Sep 17 00:00:00 2001 +From: Zoltan Kuscsik +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.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.5.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.5.bb deleted file mode 100644 index c54cfcbd2b..0000000000 --- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.5.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE" -AUTHOR = "Miklos Szeredi " -HOMEPAGE = "http://fuse.sourceforge.net/sshfs.html" -SECTION = "console/network" -LICENSE = "GPLv2" -DEPENDS = "glib-2.0 fuse" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${BP}.tar.gz" -S = "${WORKDIR}/${BP}" - -inherit autotools pkgconfig - -FILES_${PN} += "${libdir}/sshnodelay.so" - -SRC_URI[md5sum] = "17494910db8383a366b1301e5f5148a9" -SRC_URI[sha256sum] = "e9171452e5d0150b9c6a2158fd2e2dcefb5d5d03ba4d208949e00a3a46c6e63e" diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb new file mode 100644 index 0000000000..64ccdace18 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb @@ -0,0 +1,16 @@ +SUMMARY = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE" +AUTHOR = "Miklos Szeredi " +HOMEPAGE = "http://fuse.sourceforge.net/sshfs.html" +SECTION = "console/network" +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" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +FILES_${PN} += "${libdir}/sshnodelay.so" -- cgit 1.2.3-korg