[oe-commits] [meta-openembedded] 17/33: 09/17] open-vm-tools: add #include to fix build break

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit e46c961944489f4d3ebed92cd14fd2b401ba6d1d
Author: Martin Kelly <mkelly at xevo.com>
AuthorDate: Fri Jun 23 15:48:40 2017 -0700

    09/17] open-vm-tools: add #include to fix build break
    
    Signed-off-by: Martin Kelly <mkelly at xevo.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../0003-add-include-sys-sysmacros.h.patch         | 33 ++++++++++++++++++++++
 .../open-vm-tools/open-vm-tools_10.1.5.bb          |  1 +
 2 files changed, 34 insertions(+)

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 0000000..f905601
--- /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 <mkelly at xevo.com>
+Date: Mon, 22 May 2017 17:00:05 -0700
+Subject: [PATCH 2/2] add #include <sys/sysmacros.h>
+
+In newer glibc versions, the definition for major() has been moved to
+sys/sysmacros.h, and using the older version in <sys/types.h> has been
+deprecated. So, add an include for <sys/sysmacros.h>.
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Kelly <mkelly at xevo.com>
+---
+ 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 <libgen.h>
+ # endif /* __FreeBSD_version >= 500000 */
+ #endif
++#if defined(__linux__)
++#include <sys/sysmacros.h>
++#endif
+ #include <unistd.h>
+ 
+ #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 b3e0afc..2b20228 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.