summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-support/cifs/cifs-utils_6.9.bb (renamed from meta-networking/recipes-support/cifs/cifs-utils_git.bb)8
-rw-r--r--meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch32
2 files changed, 3 insertions, 37 deletions
diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_6.9.bb
index 198e3ef98..51dcb23d1 100644
--- a/meta-networking/recipes-support/cifs/cifs-utils_git.bb
+++ b/meta-networking/recipes-support/cifs/cifs-utils_6.9.bb
@@ -4,12 +4,10 @@ SECTION = "otherosfs"
4LICENSE = "GPLv3 & LGPLv3" 4LICENSE = "GPLv3 & LGPLv3"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
6 6
7PV = "6.7" 7PV = "6.9"
8 8
9SRCREV = "8101a07871f185c7044fa2ca221b282ab4607c8b" 9SRCREV = "9a8c21ad9e4510a83a3a41f7a04f763a4fe9ec09"
10SRC_URI = "git://git.samba.org/cifs-utils.git \ 10SRC_URI = "git://git.samba.org/cifs-utils.git"
11 file://0001-mount.cifs-Remove-data_blob.h-include.patch \
12 "
13 11
14S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
15DEPENDS += "libtalloc" 13DEPENDS += "libtalloc"
diff --git a/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch b/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch
deleted file mode 100644
index 07f2a5726..000000000
--- a/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
3
4From 272d523a57a4e8791d625a479128613be5e401f5 Mon Sep 17 00:00:00 2001
5From: Thomas Witt <pyromaniac@exherbo.org>
6Date: Wed, 15 Mar 2017 20:20:44 +0000
7Subject: [PATCH] mount.cifs: Remove data_blob.h include
8
9data_blob.h includes talloc.h from libtalloc, but that is only marked as
10a dependency for cifs.upcall. No symbols from that header are used by
11cifs.mount, so remove it to avoid the libtalloc dependency
12
13Signed-off-by: Thomas Witt <pyromaniac@exherbo.org>
14---
15 mount.cifs.c | 1 -
16 1 file changed, 1 deletion(-)
17
18diff --git a/mount.cifs.c b/mount.cifs.c
19index 13b71ef..2612feb 100644
20--- a/mount.cifs.c
21+++ b/mount.cifs.c
22@@ -61,7 +61,6 @@
23 #include "mount.h"
24 #include "util.h"
25 #include "resolve_host.h"
26-#include "data_blob.h"
27
28 #ifndef MS_MOVE
29 #define MS_MOVE 8192
30--
311.9.4
32