diff options
author | Martin Kelly <mkelly@xevo.com> | 2017-06-23 15:48:40 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-01 09:59:25 +0200 |
commit | b847bc1724b6d203d5eaea2d0e4e110648c2b51b (patch) | |
tree | bd560a0fd7c9d8df0fb07f39b5a12ecbd684d5b5 /meta-oe | |
parent | 16accb708c14f490605b02cfd8af5e74dd1f7ba7 (diff) | |
download | meta-openembedded-b847bc1724b6d203d5eaea2d0e4e110648c2b51b.tar.gz |
open-vm-tools: add #include to fix build break
Signed-off-by: Martin Kelly <mkelly@xevo.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-add-include-sys-sysmacros.h.patch | 33 | ||||
-rw-r--r-- | meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-add-include-sys-sysmacros.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-add-include-sys-sysmacros.h.patch new file mode 100644 index 000000000..f905601d5 --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-add-include-sys-sysmacros.h.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 5818acc8032e3247257730376e947330340a07b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Kelly <mkelly@xevo.com> | ||
3 | Date: Mon, 22 May 2017 17:00:05 -0700 | ||
4 | Subject: [PATCH 2/2] add #include <sys/sysmacros.h> | ||
5 | |||
6 | In newer glibc versions, the definition for major() has been moved to | ||
7 | sys/sysmacros.h, and using the older version in <sys/types.h> has been | ||
8 | deprecated. So, add an include for <sys/sysmacros.h>. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Martin Kelly <mkelly@xevo.com> | ||
13 | --- | ||
14 | lib/wiper/wiperPosix.c | 3 +++ | ||
15 | 1 file changed, 3 insertions(+) | ||
16 | |||
17 | diff --git a/open-vm-tools/lib/wiper/wiperPosix.c b/open-vm-tools/lib/wiper/wiperPosix.c | ||
18 | index d389eee..1f221fc 100644 | ||
19 | --- a/lib/wiper/wiperPosix.c | ||
20 | +++ b/lib/wiper/wiperPosix.c | ||
21 | @@ -40,6 +40,9 @@ | ||
22 | # include <libgen.h> | ||
23 | # endif /* __FreeBSD_version >= 500000 */ | ||
24 | #endif | ||
25 | +#if defined(__linux__) | ||
26 | +#include <sys/sysmacros.h> | ||
27 | +#endif | ||
28 | #include <unistd.h> | ||
29 | |||
30 | #include "vmware.h" | ||
31 | -- | ||
32 | 2.7.4 | ||
33 | |||
diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb index b3e0afca7..2b2022864 100644 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb | |||
@@ -25,6 +25,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ | |||
25 | file://vmtoolsd.service \ | 25 | file://vmtoolsd.service \ |
26 | file://0001-Fix-kernel-detection.patch \ | 26 | file://0001-Fix-kernel-detection.patch \ |
27 | file://0002-configure.ac-don-t-use-dnet-config.patch \ | 27 | file://0002-configure.ac-don-t-use-dnet-config.patch \ |
28 | file://0003-add-include-sys-sysmacros.h.patch \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | SRCREV = "854c0bb374612f7e633b448ca273f970f154458b" | 31 | SRCREV = "854c0bb374612f7e633b448ca273f970f154458b" |