From 62f1d7cfc39718a0a7aebccc9b4df67d4430b53a Mon Sep 17 00:00:00 2001 From: Athanasios Oikonomou Date: Sun, 22 Oct 2017 01:16:32 +0300 Subject: smbnetfs: update update 0.5.3a -> 0.6.0 It seems that updating smbnetfs to latest revision fixes build issues. Also remove the blacklist allowing the plugin to build again. Patches reworked to apply on 0.6.0. Additionally handle missing libexecinfo (DEPENDS and LDFLAGS) when building with musl else we are getting the following error: | ../../git/src/common.c:7:10: fatal error: execinfo.h: No such file or directory | #include Signed-off-by: Athanasios Oikonomou Signed-off-by: Armin Kuster --- .../Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch | 6 +++--- .../recipes-filesystems/smbnetfs/smbnetfs/configure.patch | 6 +++--- meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) (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 index f05f09f61c..371ab89821 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 src/Makefile.am | 3 +++ 2 files changed, 8 insertions(+) -diff --git a/configure.in b/configure.in +diff --git a/configure.ac b/configure.ac index ce21aef..ecd7119 100644 ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -125,6 +125,11 @@ AC_CHECK_LIB(smbclient, smbc_setOptionUserData, )] ) diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch index c80fed1879..152507cf31 100644 --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch @@ -1,9 +1,9 @@ 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 +--- git.orig/configure.ac 2014-06-18 16:06:16.040721349 +0000 ++++ git/configure.ac 2014-07-18 07:49:17.085552256 +0000 @@ -1,5 +1,5 @@ - AC_INIT([SMBNetFS],[0.5.3а]) + AC_INIT([SMBNetFS],[0.6.0]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) 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 6995ad3f52..0fcfd6ae75 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" HOMEPAGE ="http://sourceforge.net/projects/smbnetfs" DEPENDS = "fuse samba" +DEPENDS_append_libc-musl = " libexecinfo" inherit autotools gitpkgv pkgconfig PKGV = "${GITPKGVTAG}" -SRCREV = "ace1c519d45fe488b9b7e6cc77a2bcadb6c83464" +SRCREV = "21c63ed60202e5540613d4c822a57a0b81764499" SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \ file://configure.patch \ @@ -25,4 +26,4 @@ PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring=yes,--with-gnome-keyring=no 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" +LDFLAGS_append_libc-musl = " -lexecinfo" -- cgit 1.2.3-korg