CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

open-vm-tools: Upgrade to 10.3.5

Browse Source 
Add a patch to fix build with gcc9

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2018-12-22 20:05:35 -08:00
parent 55f2541bf6
commit 5f063ad3b6
2 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-misc-Do-not-print-NULL-string-into-logs.patch Normal file
View File

@ -0,0 +1,31 @@
From e25d00d8297cba044c3a4d2e38749e54adac66c1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 22 Dec 2018 19:59:02 -0800
Subject: [PATCH] misc: Do not print NULL string into logs
string format %s is getting a NULL pointer for 'expand'
parameter always since the check for chunks[i] == NULL will ensure that
its always null when the Log() API is called
Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/312]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
open-vm-tools/lib/misc/util_misc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git open-vm-tools/lib/misc/util_misc.c b/open-vm-tools/lib/misc/util_misc.c
index 198c23d2..0ac0a335 100644
--- open-vm-tools/lib/misc/util_misc.c
+++ open-vm-tools/lib/misc/util_misc.c
@@ -719,8 +719,8 @@ Util_ExpandString(const char *fileName) // IN file path to expand
ASSERT(!freeChunk[i]);
chunks[i] = expand;
if (chunks[i] == NULL) {
- Log("%s: Cannot allocate memory to expand \"%s\" in \"%s\".\n",
- __FUNCTION__, expand, fileName);
+ Log("%s: Cannot allocate memory to expand in \"%s\".\n",
+ __FUNCTION__, fileName);
goto out;
}
chunkSize[i] = strlen(expand);

36
meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.0.bb → meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.5.bb
View File

@ -22,23 +22,25 @@ LICENSE_modules/linux = "GPL-2.0"
LICENSE_modules/solaris = "CDDL-1.0"
SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \
file://tools.conf \
file://vmtoolsd.service \
file://vmtoolsd.init \
file://0001-configure.ac-don-t-use-dnet-config.patch \
file://0002-add-include-sys-sysmacros.h.patch \
file://0005-Use-configure-test-for-struct-timespec.patch \
file://0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch \
file://0007-Use-configure-to-test-for-feature-instead-of-platfor.patch \
file://0011-Use-configure-test-for-sys-stat.h-include.patch \
file://fix-subdir-objects-configure-error.patch \
file://0001-include-poll.h-instead-of-sys-poll.h.patch \
file://0002-Rename-poll.h-to-vm_poll.h.patch \
file://0003-use-posix-strerror_r-unless-on-gnu-libc-system.patch \
file://0004-Use-uintmax_t-for-handling-rlim_t.patch \
file://0001-Use-off64_t-instead-of-__off64_t.patch \
"
SRCREV = "2147df6aabe639fc5ff423ed791a8e7f02bf8d0a"
file://tools.conf \
file://vmtoolsd.service \
file://vmtoolsd.init \
file://0001-configure.ac-don-t-use-dnet-config.patch \
file://0002-add-include-sys-sysmacros.h.patch \
file://0005-Use-configure-test-for-struct-timespec.patch \
file://0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch \
file://0007-Use-configure-to-test-for-feature-instead-of-platfor.patch \
file://0011-Use-configure-test-for-sys-stat.h-include.patch \
file://fix-subdir-objects-configure-error.patch \
file://0001-include-poll.h-instead-of-sys-poll.h.patch \
file://0002-Rename-poll.h-to-vm_poll.h.patch \
file://0003-use-posix-strerror_r-unless-on-gnu-libc-system.patch \
file://0004-Use-uintmax_t-for-handling-rlim_t.patch \
file://0001-Use-off64_t-instead-of-__off64_t.patch \
file://0001-misc-Do-not-print-NULL-string-into-logs.patch \
"
# stable-10.3.5
SRCREV = "f2ff192717375b95a6b7e278fb47dbb3d3bc56d1"
S = "${WORKDIR}/git/open-vm-tools"