cifs-utils: mount.cifs should build without samba dependency

PATCH New S. Lockwood-Childs 1 participant 1 message Dec 16, 2017

lore

Share & tools

lore

S. Lockwood-Childs

author

2017-12-16 01:15 UTC #0 lore raw

PATCH 1/1 cifs-utils: mount.cifs should build without samba dependency

fix following build error when cifsidmap and cifsacl are turned off in PACKAGECONFIG :

| In file included from ../git/mount.cifs.c:64:0:
| ../git/data_blob.h:26:10: fatal error: talloc.h: No such file or directory

cifs-utils 3.7 had an unneeded header creep into mount.cifs source that pulled in samba headers. This has been cleaned up already in cifs-utils master, so apply (trivial) upstream patch to fix this compile error.

Signed-off-by S. Lockwood-Childs <[email protected]>

---
 .../recipes-support/cifs/cifs-utils_git.bb         |  4 ++-
 ...001-mount.cifs-Remove-data_blob.h-include.patch | 32 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch

meta-networking/recipes-support/cifs/cifs-utils_git.bb +3 -1

index 3ca5b78..198e3ef 100644
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 PV = "6.7"
 
 SRCREV = "8101a07871f185c7044fa2ca221b282ab4607c8b"
-SRC_URI = "git://git.samba.org/cifs-utils.git"
+SRC_URI = "git://git.samba.org/cifs-utils.git \
+           file://0001-mount.cifs-Remove-data_blob.h-include.patch \
+          "
 
 S = "${WORKDIR}/git"
 DEPENDS += "libtalloc"

meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch new file +32 -0

new file mode 100644
index 0000000..07f2a57
@@ -0,0 +1,32 @@
+Upstream-Status: Backport
+Signed-off-by: S. Lockwood-Childs <[email protected]>
+
+From 272d523a57a4e8791d625a479128613be5e401f5 Mon Sep 17 00:00:00 2001
+From: Thomas Witt <[email protected]>
+Date: Wed, 15 Mar 2017 20:20:44 +0000
+Subject: [PATCH] mount.cifs: Remove data_blob.h include
+
+data_blob.h includes talloc.h from libtalloc, but that is only marked as
+a dependency for cifs.upcall. No symbols from that header are used by
+cifs.mount, so remove it to avoid the libtalloc dependency
+
+Signed-off-by: Thomas Witt <[email protected]>
+---
+ mount.cifs.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/mount.cifs.c b/mount.cifs.c
+index 13b71ef..2612feb 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -61,7 +61,6 @@
+ #include "mount.h"
+ #include "util.h"
+ #include "resolve_host.h"
+-#include "data_blob.h"
+ 
+ #ifndef MS_MOVE 
+ #define MS_MOVE 8192 
+-- 
+1.9.4
+

Signature · 1 line

1.9.4