diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2022-10-10 22:11:41 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-10-10 10:19:33 -0700 |
commit | 7cd9307271c9c8aa336f4c43cf8739dbd2f437a8 (patch) | |
tree | 8293e8d6dd93800af96620ab10e2f33fafee9cb1 /meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch | |
parent | 8ae057a2e6862e4312ed4fa2fc635ce92b22d7ca (diff) | |
download | meta-openembedded-contrib-7cd9307271c9c8aa336f4c43cf8739dbd2f437a8.tar.gz |
open-vm-tools: upgrade 11.3.5 -> 12.1.0
* Drop 0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch
and 0013-misc-Do-not-print-NULL-string-into-logs.patch which have been
merged upstream.
* Refresh patches.
* Do not build containerinfo plugin as it requries containerd.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch')
-rw-r--r-- | meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch new file mode 100644 index 0000000000..83687460bf --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch @@ -0,0 +1,36 @@ +From 7f7e00ce582d72013cb54278548d3320e032b0dc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 7 Feb 2022 13:32:32 -0800 +Subject: [PATCH] open-vm-tools: Correct include path for poll.h + +sys/poll.h is deprecated and musl calls it out explicitly. + +Fixes +| In file included from ../../../../git/open-vm-tools/services/plugins/gdp/gdpPlugin.c:35: +| /mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux-musl/open-vm-tools/11.3.5-r0/recipe-sysroot/usr/include/sys/poll.h:1:2: error: redirecting incorrect #include <sys/poll.h> to <poll.h> [-Werror,-W#warnings] +| #warning redirecting incorrect #include <sys/poll.h> to <poll.h> +| ^ +| 1 error generated. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + open-vm-tools/services/plugins/gdp/gdpPlugin.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/open-vm-tools/services/plugins/gdp/gdpPlugin.c b/open-vm-tools/services/plugins/gdp/gdpPlugin.c +index 2bba2937e..025339595 100644 +--- a/open-vm-tools/services/plugins/gdp/gdpPlugin.c ++++ b/open-vm-tools/services/plugins/gdp/gdpPlugin.c +@@ -32,7 +32,7 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/eventfd.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <unistd.h> + #endif + +-- +2.25.1 + |