diff options
author | S. Lockwood-Childs <sjl@vctlabs.com> | 2017-12-15 17:18:26 -0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2018-01-08 12:05:43 -0500 |
commit | 0309df9fb4608590d57f5d358e0723f22a523115 (patch) | |
tree | 358e139258391ff95f2f3b7b4780abd3d6d8a338 /meta-networking | |
parent | 3b0b5aa94a363d8046c6edac5868174ddd69c2eb (diff) | |
download | meta-openembedded-0309df9fb4608590d57f5d358e0723f22a523115.tar.gz |
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 <sjl@vctlabs.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-support/cifs/cifs-utils_git.bb | 4 | ||||
-rw-r--r-- | meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch | 32 |
2 files changed, 35 insertions, 1 deletions
diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_git.bb index 3ca5b780b..198e3ef98 100644 --- a/meta-networking/recipes-support/cifs/cifs-utils_git.bb +++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb | |||
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
7 | PV = "6.7" | 7 | PV = "6.7" |
8 | 8 | ||
9 | SRCREV = "8101a07871f185c7044fa2ca221b282ab4607c8b" | 9 | SRCREV = "8101a07871f185c7044fa2ca221b282ab4607c8b" |
10 | SRC_URI = "git://git.samba.org/cifs-utils.git" | 10 | SRC_URI = "git://git.samba.org/cifs-utils.git \ |
11 | file://0001-mount.cifs-Remove-data_blob.h-include.patch \ | ||
12 | " | ||
11 | 13 | ||
12 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
13 | DEPENDS += "libtalloc" | 15 | DEPENDS += "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 new file mode 100644 index 000000000..07f2a5726 --- /dev/null +++ b/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com> | ||
3 | |||
4 | From 272d523a57a4e8791d625a479128613be5e401f5 Mon Sep 17 00:00:00 2001 | ||
5 | From: Thomas Witt <pyromaniac@exherbo.org> | ||
6 | Date: Wed, 15 Mar 2017 20:20:44 +0000 | ||
7 | Subject: [PATCH] mount.cifs: Remove data_blob.h include | ||
8 | |||
9 | data_blob.h includes talloc.h from libtalloc, but that is only marked as | ||
10 | a dependency for cifs.upcall. No symbols from that header are used by | ||
11 | cifs.mount, so remove it to avoid the libtalloc dependency | ||
12 | |||
13 | Signed-off-by: Thomas Witt <pyromaniac@exherbo.org> | ||
14 | --- | ||
15 | mount.cifs.c | 1 - | ||
16 | 1 file changed, 1 deletion(-) | ||
17 | |||
18 | diff --git a/mount.cifs.c b/mount.cifs.c | ||
19 | index 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 | -- | ||
31 | 1.9.4 | ||
32 | |||