Message ID | 1467360233-28860-1-git-send-email-zoltan.kuscsik@linaro.org |
---|---|
State | Superseded |
Headers | show |
hi Zoltan, On Fri, Jul 1, 2016 at 10:03 AM, Zoltan Kuscsik <zoltan.kuscsik@linaro.org> wrote: > Signed-off-by: Zoltan Kuscsik <zoltan.kuscsik@linaro.org> > --- > .../files/0001-Makefile-fix-path-for-sshfs.1.patch | 27 ++++++++++++++++++++++ > .../{sshfs-fuse_2.5.bb => sshfs-fuse_2.8.bb} | 9 ++++---- > 2 files changed, 31 insertions(+), 5 deletions(-) > create mode 100644 meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch > rename meta-filesystems/recipes-filesystems/sshfs-fuse/{sshfs-fuse_2.5.bb => sshfs-fuse_2.8.bb} (65%) > > 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 0000000..39c1f04 > --- /dev/null > +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch > @@ -0,0 +1,27 @@ > +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. please check http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations. And at least add upstream-status tag and link to your github pull request ( i saw that you sent it already!) > +--- > + 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.5.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb > similarity index 65% > rename from meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.5.bb > rename to meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb > index c54cfcb..64ccdac 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" > DEPENDS = "glib-2.0 fuse" > LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > > -SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${BP}.tar.gz" > -S = "${WORKDIR}/${BP}" > +SRC_URI = "git://github.com/libfuse/sshfs;tag=b2fa7593586b141298e6159f40f521d2b0f4f894 \ this change is legit indeed, but probably need an explanation in the commit msg as to why you are switching from tarball to git. > + file://0001-Makefile-fix-path-for-sshfs.1.patch" > + > +S = "${WORKDIR}/git" > > inherit autotools pkgconfig > > FILES_${PN} += "${libdir}/sshnodelay.so" > - > -SRC_URI[md5sum] = "17494910db8383a366b1301e5f5148a9" > -SRC_URI[sha256sum] = "e9171452e5d0150b9c6a2158fd2e2dcefb5d5d03ba4d208949e00a3a46c6e63e" > -- > 1.9.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
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 0000000..39c1f04 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch @@ -0,0 +1,27 @@ +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. +--- + 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.5.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb similarity index 65% rename from meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.5.bb rename to meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb index c54cfcb..64ccdac 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" DEPENDS = "glib-2.0 fuse" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${BP}.tar.gz" -S = "${WORKDIR}/${BP}" +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" - -SRC_URI[md5sum] = "17494910db8383a366b1301e5f5148a9" -SRC_URI[sha256sum] = "e9171452e5d0150b9c6a2158fd2e2dcefb5d5d03ba4d208949e00a3a46c6e63e"
Signed-off-by: Zoltan Kuscsik <zoltan.kuscsik@linaro.org> --- .../files/0001-Makefile-fix-path-for-sshfs.1.patch | 27 ++++++++++++++++++++++ .../{sshfs-fuse_2.5.bb => sshfs-fuse_2.8.bb} | 9 ++++---- 2 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch rename meta-filesystems/recipes-filesystems/sshfs-fuse/{sshfs-fuse_2.5.bb => sshfs-fuse_2.8.bb} (65%) -- 1.9.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel