summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-support/open-vm-tools
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking/recipes-support/open-vm-tools')
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch26
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.5.bb (renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb)5
2 files changed, 2 insertions, 29 deletions
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch
deleted file mode 100644
index aad1b10b52..0000000000
--- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 2a79621f58bf1c4bc0166ccc044fcf343fb66b44 Mon Sep 17 00:00:00 2001
2From: Rudi Heitbaum <rudi@heitbaum.com>
3Date: Wed, 20 Nov 2024 10:40:03 +1100
4Subject: [PATCH] Fix build when compiling with -std=c23
5
6Fixes the build when using gcc 15
7
8Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/751]
9Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
10---
11 open-vm-tools/lib/lock/ul.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/open-vm-tools/lib/lock/ul.c b/open-vm-tools/lib/lock/ul.c
15index d376a98af..fc9fdb714 100644
16--- a/open-vm-tools/lib/lock/ul.c
17+++ b/open-vm-tools/lib/lock/ul.c
18@@ -29,7 +29,7 @@
19 static Bool mxInPanic = FALSE; // track when involved in a panic
20 static Bool mxUserCollectLockingTree = FALSE;
21
22-Bool (*MXUserTryAcquireForceFail)() = NULL;
23+Bool (*MXUserTryAcquireForceFail)(const char *) = NULL;
24
25 static MX_Rank (*MXUserMxCheckRank)(void) = NULL;
26 static void (*MXUserMxLockLister)(void) = NULL;
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.5.bb
index fa26a759dc..304d910940 100644
--- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb
+++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.5.bb
@@ -25,7 +25,7 @@ LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only"
25LICENSE:modules/linux = "GPL-2.0-only" 25LICENSE:modules/linux = "GPL-2.0-only"
26LICENSE:modules/solaris = "CDDL-1.0" 26LICENSE:modules/solaris = "CDDL-1.0"
27 27
28SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.5.x \ 28SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-13.0.x \
29 file://tools.conf \ 29 file://tools.conf \
30 file://vmtoolsd.service \ 30 file://vmtoolsd.service \
31 file://vmtoolsd.init \ 31 file://vmtoolsd.init \
@@ -43,7 +43,6 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stabl
43 file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ 43 file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \
44 file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ 44 file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \
45 file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ 45 file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \
46 file://0001-Fix-build-when-compiling-with-std-c23.patch;patchdir=.. \
47 " 46 "
48 47
49UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" 48UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"
@@ -51,7 +50,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"
51SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ 50SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \
52" 51"
53 52
54SRCREV = "f2ca37ef3510543172657b82493d1eceefa9a134" 53SRCREV = "fbc80ffbd226b4a61bb8ea1c9a682b5c7614e3fd"
55 54
56S = "${UNPACKDIR}/${BP}/open-vm-tools" 55S = "${UNPACKDIR}/${BP}/open-vm-tools"
57 56