summaryrefslogtreecommitdiffstats
path: root/meta-filesystems
diff options
context:
space:
mode:
Diffstat (limited to 'meta-filesystems')
-rw-r--r--meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch6
-rw-r--r--meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch6
-rw-r--r--meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb5
3 files changed, 9 insertions, 8 deletions
diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch
index f05f09f61..371ab8982 100644
--- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch
+++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch
@@ -10,10 +10,10 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
10 src/Makefile.am | 3 +++ 10 src/Makefile.am | 3 +++
11 2 files changed, 8 insertions(+) 11 2 files changed, 8 insertions(+)
12 12
13diff --git a/configure.in b/configure.in 13diff --git a/configure.ac b/configure.ac
14index ce21aef..ecd7119 100644 14index ce21aef..ecd7119 100644
15--- a/configure.in 15--- a/configure.ac
16+++ b/configure.in 16+++ b/configure.ac
17@@ -125,6 +125,11 @@ AC_CHECK_LIB(smbclient, smbc_setOptionUserData, 17@@ -125,6 +125,11 @@ AC_CHECK_LIB(smbclient, smbc_setOptionUserData,
18 )] 18 )]
19 ) 19 )
diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch
index c80fed187..152507cf3 100644
--- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch
+++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch
@@ -1,9 +1,9 @@
1Index: git/configure.in 1Index: git/configure.in
2=================================================================== 2===================================================================
3--- git.orig/configure.in 2014-06-18 16:06:16.040721349 +0000 3--- git.orig/configure.ac 2014-06-18 16:06:16.040721349 +0000
4+++ git/configure.in 2014-07-18 07:49:17.085552256 +0000 4+++ git/configure.ac 2014-07-18 07:49:17.085552256 +0000
5@@ -1,5 +1,5 @@ 5@@ -1,5 +1,5 @@
6 AC_INIT([SMBNetFS],[0.5.]) 6 AC_INIT([SMBNetFS],[0.6.0])
7-AM_INIT_AUTOMAKE 7-AM_INIT_AUTOMAKE
8+AM_INIT_AUTOMAKE([foreign]) 8+AM_INIT_AUTOMAKE([foreign])
9 AC_CONFIG_HEADERS([src/config.h]) 9 AC_CONFIG_HEADERS([src/config.h])
diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
index 6995ad3f5..0fcfd6ae7 100644
--- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
+++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
@@ -9,12 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
9HOMEPAGE ="http://sourceforge.net/projects/smbnetfs" 9HOMEPAGE ="http://sourceforge.net/projects/smbnetfs"
10 10
11DEPENDS = "fuse samba" 11DEPENDS = "fuse samba"
12DEPENDS_append_libc-musl = " libexecinfo"
12 13
13inherit autotools gitpkgv pkgconfig 14inherit autotools gitpkgv pkgconfig
14 15
15PKGV = "${GITPKGVTAG}" 16PKGV = "${GITPKGVTAG}"
16 17
17SRCREV = "ace1c519d45fe488b9b7e6cc77a2bcadb6c83464" 18SRCREV = "21c63ed60202e5540613d4c822a57a0b81764499"
18 19
19SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \ 20SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \
20 file://configure.patch \ 21 file://configure.patch \
@@ -25,4 +26,4 @@ PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring=yes,--with-gnome-keyring=no
25 26
26S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"
27 28
28PNBLACKLIST[smbnetfs] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/132827/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" 29LDFLAGS_append_libc-musl = " -lexecinfo"