diff options
| -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 3ca5b780bd..198e3ef987 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 0000000000..07f2a57264 --- /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 | |||
