From b847bc1724b6d203d5eaea2d0e4e110648c2b51b Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Fri, 23 Jun 2017 15:48:40 -0700 Subject: open-vm-tools: add #include to fix build break Signed-off-by: Martin Kelly Signed-off-by: Martin Jansa --- .../0003-add-include-sys-sysmacros.h.patch | 33 ++++++++++++++++++++++ .../open-vm-tools/open-vm-tools_10.1.5.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-add-include-sys-sysmacros.h.patch 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 0000000000..f905601d52 --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-add-include-sys-sysmacros.h.patch @@ -0,0 +1,33 @@ +From 5818acc8032e3247257730376e947330340a07b3 Mon Sep 17 00:00:00 2001 +From: Martin Kelly +Date: Mon, 22 May 2017 17:00:05 -0700 +Subject: [PATCH 2/2] add #include + +In newer glibc versions, the definition for major() has been moved to +sys/sysmacros.h, and using the older version in has been +deprecated. So, add an include for . + +Upstream-Status: Pending + +Signed-off-by: Martin Kelly +--- + lib/wiper/wiperPosix.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/open-vm-tools/lib/wiper/wiperPosix.c b/open-vm-tools/lib/wiper/wiperPosix.c +index d389eee..1f221fc 100644 +--- a/lib/wiper/wiperPosix.c ++++ b/lib/wiper/wiperPosix.c +@@ -40,6 +40,9 @@ + # include + # endif /* __FreeBSD_version >= 500000 */ + #endif ++#if defined(__linux__) ++#include ++#endif + #include + + #include "vmware.h" +-- +2.7.4 + 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 b3e0afca73..2b2022864e 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 \ file://vmtoolsd.service \ file://0001-Fix-kernel-detection.patch \ file://0002-configure.ac-don-t-use-dnet-config.patch \ + file://0003-add-include-sys-sysmacros.h.patch \ " SRCREV = "854c0bb374612f7e633b448ca273f970f154458b" -- cgit v1.2.3-54-g00ecf