diff options
author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-04-07 15:50:33 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-04-09 17:46:56 -0700 |
commit | d4a87d6ed0381b6a1f735270f0471bb479bf306f (patch) | |
tree | 6924420888b7cdabcded0838022678b021cc7b0e | |
parent | c7b4b505c22ea36ff8918c4378dcb9a0421cfb78 (diff) | |
download | meta-openembedded-contrib-d4a87d6ed0381b6a1f735270f0471bb479bf306f.tar.gz |
cifs-utils: update to 6.9
Removed patch has been upstreammed.
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-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.patch | 32 |
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 198e3ef987..51dcb23d11 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" LICENSE = "GPLv3 & LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -PV = "6.7" +PV = "6.9" -SRCREV = "8101a07871f185c7044fa2ca221b282ab4607c8b" -SRC_URI = "git://git.samba.org/cifs-utils.git \ - file://0001-mount.cifs-Remove-data_blob.h-include.patch \ - " +SRCREV = "9a8c21ad9e4510a83a3a41f7a04f763a4fe9ec09" +SRC_URI = "git://git.samba.org/cifs-utils.git" S = "${WORKDIR}/git" 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 deleted file mode 100644 index 07f2a57264..0000000000 --- a/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com> - -From 272d523a57a4e8791d625a479128613be5e401f5 Mon Sep 17 00:00:00 2001 -From: Thomas Witt <pyromaniac@exherbo.org> -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 <pyromaniac@exherbo.org> ---- - 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 - |