From 3594d16a15120626739a34541a3631303e6b766e Mon Sep 17 00:00:00 2001 From: Athanasios Oikonomou Date: Sun, 22 Oct 2017 01:16:31 +0300 Subject: Revert "smbnetfs: delete blacklisted" This reverts commit 8159e7d528d61779b711be8b044a4ef2d1ca0ebe. Signed-off-by: Athanasios Oikonomou Signed-off-by: Armin Kuster --- ...CK_MODULES-to-found-headers-and-libraries.patch | 42 ++++++++++++++++++++++ .../smbnetfs/smbnetfs/configure.patch | 11 ++++++ .../recipes-filesystems/smbnetfs/smbnetfs_git.bb | 28 +++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch create mode 100644 meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch create mode 100644 meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb (limited to 'meta-filesystems') 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 new file mode 100644 index 0000000000..f05f09f61c --- /dev/null +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch @@ -0,0 +1,42 @@ +From 7a524d49b3d4459280f18942df2980603400ec52 Mon Sep 17 00:00:00 2001 +From: Bian Naimeng +Date: Fri, 19 Jun 2015 11:54:44 +0900 +Subject: [PATCH] Using PKG_CHECK_MODULES to found headers and libraries of + smbclient + +Signed-off-by: Bian Naimeng +--- + configure.in | 5 +++++ + src/Makefile.am | 3 +++ + 2 files changed, 8 insertions(+) + +diff --git a/configure.in b/configure.in +index ce21aef..ecd7119 100644 +--- a/configure.in ++++ b/configure.in +@@ -125,6 +125,11 @@ AC_CHECK_LIB(smbclient, smbc_setOptionUserData, + )] + ) + ++dnl ***************************************************************** ++dnl *** Check libsmbclient by pkgconfig to get cflags and ldflags *** ++dnl ***************************************************************** ++PKG_CHECK_MODULES(SMBCLIENT, smbclient) ++ + dnl ****************** + dnl *** Final step *** + dnl ****************** +diff --git a/src/Makefile.am b/src/Makefile.am +index 41519d8..9fc97e9 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -16,3 +16,6 @@ smbnetfs_SOURCES = \ + event.c event.h \ + reconfigure.c reconfigure.h \ + main.c ++ ++smbnetfs_CFLAGS=${SMBCLIENT_CFLAGS} ++smbnetfs_LDFLAGS=${SMBCLIENT_LDFLAGS} +-- +1.8.4.2 + diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch new file mode 100644 index 0000000000..c80fed1879 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch @@ -0,0 +1,11 @@ +Index: git/configure.in +=================================================================== +--- git.orig/configure.in 2014-06-18 16:06:16.040721349 +0000 ++++ git/configure.in 2014-07-18 07:49:17.085552256 +0000 +@@ -1,5 +1,5 @@ + AC_INIT([SMBNetFS],[0.5.3а]) +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + AC_CONFIG_HEADERS([src/config.h]) + AC_PROG_CC + diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb new file mode 100644 index 0000000000..6995ad3f52 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb @@ -0,0 +1,28 @@ +SUMMARY = "FUSE module for mounting an entire SMB/NMB network in a single directory" +DESCRIPTION = "SMBNetFS is a Linux/FreeBSD filesystem that allow you to use \ + samba/microsoft network in the same manner as the network \ + neighborhood in Microsoft Windows. Please donate me to help \ + in SMBNetFS development." + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" +HOMEPAGE ="http://sourceforge.net/projects/smbnetfs" + +DEPENDS = "fuse samba" + +inherit autotools gitpkgv pkgconfig + +PKGV = "${GITPKGVTAG}" + +SRCREV = "ace1c519d45fe488b9b7e6cc77a2bcadb6c83464" + +SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \ + file://configure.patch \ + file://Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring=yes,--with-gnome-keyring=no,libgnome-keyring" + +S = "${WORKDIR}/git" + +PNBLACKLIST[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" -- cgit 1.2.3-korg