[meta-oe][PATCH v2] 00/17] new recipe v2: open-vm-tools recipe

[meta-oe][PATCH v2] 00/17] new recipe v2: open-vm-tools recipe

[Martin Kelly]

Hi all,

This is version 2 of a patch series to add a new recipe for Open VM Tools to
meta-oe. This recipe is invaluable for using Openembedded with VMWare, as
without the tools, performance is very slow.

More information about Open VM Tools can be found here:

https://github.com/vmware/open-vm-tools

Please note that, as mentioned in the first commit, this recipe is modified
from the recipe originally found in the Open-Switch repository. The first
patch is directly from that repository, and the following patches are
modifications to it.

Original recipe: https://github.com/open-switch/ops-build
yocto/openswitch/meta-foss-openswitch/recipes-extended/open-vm-tools/open-vm-tools_10.0.5.bb
Commit 9008de2d8e100f3f868c66765742bca9fa98f3f9

Although the original recipe packaging was Apache-licensed, I received
permission from the author (Diego Dompe) to relicense it under the MIT license
for inclusion in meta-openembedded:

https://lists.openswitch.net/pipermail/ops-dev/2017-April/014715.html
https://lists.openswitch.net/pipermail/ops-dev/2017-April/014716.html

The following changes since commit d2da8b82cfb2f8e55236751c1c56c9e7f3b5f68d:

  scsirastools: Upgrade to 1.6.6 (2017-06-22 16:04:14 +0200)

are available in the git repository at:

  git://github.com/XevoInc/meta-openembedded open-vm-tools-v2
  https://github.com/XevoInc/meta-openembedded/tree/open-vm-tools-v2

Martin Kelly (17):
  add open-vm-tools recipe
  open-vm-tools: add missing pkgconfig dependency
  open-vm-tools: add missing glib-2.0-native dependency
  open-vm-tools: clarify and expand licensing
  open-vm-tools: base_contains --> bb.utils.contains
  open-vm-tools: update version to 10.1.5
  open-vm-tools: don't use mspack
  open-vm-tools: don't use dnet-config
  open-vm-tools: add #include to fix build break
  open-vm-tools: add missing X11 dependencies
  open-vm-tools: remove kernel module logic
  open-vm-tools: line up configure options
  open-vm-tools: support FUSE
  open-vm-tools: scope build to only x86
  open-vm-tools: style changes
  open-vm-tools: fix all hardcoded paths
  open-vm-tools: remove -Wno-error

 .../recipes-support/open-vm-tools/files/tools.conf |  2 +
 .../open-vm-tools/files/vmtoolsd.service           | 11 +++
 .../0001-configure.ac-don-t-use-dnet-config.patch  | 41 +++++++++++
 .../0002-add-include-sys-sysmacros.h.patch         | 33 +++++++++
 .../open-vm-tools/open-vm-tools_10.1.5.bb          | 84 ++++++++++++++++++++++
 5 files changed, 171 insertions(+)
 create mode 100644 meta-oe/recipes-support/open-vm-tools/files/tools.conf
 create mode 100644 meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service
 create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch
 create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch
 create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb

-- 
2.11.0

[meta-oe][PATCH v2] 01/17] add open-vm-tools recipe

[Martin Kelly]

This recipe is modified from the recipe originally found in the Open-Switch
repository:

https://github.com/open-switch/ops-build
yocto/openswitch/meta-foss-openswitch/recipes-extended/open-vm-tools/open-vm-tools_10.0.5.bb
Commit 9008de2d8e100f3f868c66765742bca9fa98f3f9

Although the original recipe packaging was Apache-licensed, I received
permission from the author (Diego Dompe) to relicense it under the MIT license
for inclusion in meta-openembedded:

https://lists.openswitch.net/pipermail/ops-dev/2017-April/014715.html
https://lists.openswitch.net/pipermail/ops-dev/2017-April/014716.html

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 .../recipes-support/open-vm-tools/files/tools.conf |  2 +
 .../open-vm-tools/files/vmtoolsd.service           | 11 ++++
 .../open-vm-tools/0001-Fix-kernel-detection.patch  | 35 ++++++++++
 .../open-vm-tools/open-vm-tools_10.0.5.bb          | 75 ++++++++++++++++++++++
 4 files changed, 123 insertions(+)
 create mode 100644 meta-oe/recipes-support/open-vm-tools/files/tools.conf
 create mode 100644 meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service
 create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-kernel-detection.patch
 create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb

diff --git a/meta-oe/recipes-support/open-vm-tools/files/tools.conf b/meta-oe/recipes-support/open-vm-tools/files/tools.conf
new file mode 100644
index 000000000..f6cae70cc
--- /dev/null
+++ b/meta-oe/recipes-support/open-vm-tools/files/tools.conf
@@ -0,0 +1,2 @@
+[guestinfo]
+disable-perf-mon=1
diff --git a/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service b/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service
new file mode 100644
index 000000000..d30e38055
--- /dev/null
+++ b/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Open Virtual Machine Tools (VMware Tools)
+ConditionVirtualization=vmware
+
+[Service]
+ExecStart=/usr/bin/vmtoolsd
+Restart=on-failure
+KillSignal=SIGKILL
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-kernel-detection.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-kernel-detection.patch
new file mode 100644
index 000000000..63ea45324
--- /dev/null
+++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-kernel-detection.patch
@@ -0,0 +1,35 @@
+From 5d8814f4b4f016a633984822a6dfbc9426fef333 Mon Sep 17 00:00:00 2001
+From: Diego Dompe <dompe@hpe.com>
+Date: Thu, 7 Jan 2016 15:06:16 -0600
+Subject: [PATCH] Fix-kernel-detection
+
+Signed-off-by: Diego Dompe <dompe@hpe.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 04e3bac..1ab3f29 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -151,7 +151,7 @@ if test "$with_kernel_modules" = "yes"; then
+          if test ! -d "$LINUXDIR/kernel/"; then
+              AC_MSG_ERROR([$LINUXDIR/kernel does not exist])
+          fi
+-         LINUXINCLUDE="$LINUXDIR/build/include"
++         LINUXINCLUDE="$LINUXDIR/include"
+          if test ! -d "$LINUXINCLUDE"; then
+             AC_MSG_ERROR([Can't find include dir under $LINUXDIR])
+          fi
+@@ -1034,7 +1034,7 @@ MODULES_DIR=""
+ buildHgfsmounter=no
+ 
+ if test "$os" = "linux"; then
+-   MODULES_DIR="$LINUXDIR/kernel/"
++   MODULES_DIR="/lib/modules/$KERNEL_RELEASE"
+ 
+    CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
+    CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
new file mode 100644
index 000000000..4dee03a23
--- /dev/null
+++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
@@ -0,0 +1,75 @@
+# This recipe is modified from the recipe originally found in the Open-Switch
+# repository:
+#
+# https://github.com/open-switch/ops-build
+# yocto/openswitch/meta-foss-openswitch/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
+# Commit 9008de2d8e100f3f868c66765742bca9fa98f3f9
+#
+# The recipe packaging has been relicensed under the MIT license for inclusion
+# in meta-openembedded by agreement of the author (Diego Dompe).
+#
+
+DECRIPTION = "open-vm-tools"
+SECTION = "vmware-tools"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5804fe91d3294da4ac47c02b454bbc8a"
+
+PR = "r5"
+
+SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \
+           file://tools.conf \
+           file://vmtoolsd.service \
+           file://0001-Fix-kernel-detection.patch \
+           "
+
+SRCREV = "538ea037a1549b6fd4e57529f7448a3fd2aa47af"
+
+S = "${WORKDIR}/git/open-vm-tools"
+
+DEPENDS = "virtual/kernel glib-2.0 util-linux libdnet procps libmspack"
+RDEPENDS_${PN} = "util-linux libdnet kernel-module-vmhgfs"
+
+inherit module-base kernel-module-split autotools systemd
+
+# from module.bbclass...
+addtask make_scripts after do_patch before do_compile
+do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
+do_make_scripts[depends] = "virtual/kernel:do_shared_workdir"
+# add all splitted modules to PN RDEPENDS, PN can be empty now
+KERNEL_MODULES_META_PACKAGE = "${PN}"
+
+SYSTEMD_SERVICE_${PN} = "vmtoolsd.service"
+
+EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs --disable-tests \
+		--without-gtk2 --without-gtkmm --without-xerces --without-pam \
+                --disable-grabbitmqproxy --disable-vgauth --disable-deploypkg \
+		--with-linuxdir=${STAGING_KERNEL_DIR} --with-kernel-release=${KERNEL_VERSION} --without-root-privileges"
+
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'x11', '', '--without-x', d)}"
+
+EXTRA_OEMAKE = "KERNEL_RELEASE=${KERNEL_VERSION}"
+
+
+CFLAGS += '-Wno-error=deprecated-declarations'
+
+FILES_${PN} += "/usr/lib/open-vm-tools/plugins/vmsvc/lib*.so \
+		/usr/lib/open-vm-tools/plugins/common/lib*.so \
+    ${sysconfdir}/vmware-tools/tools.conf"
+FILES_${PN}-locale += "/usr/share/open-vm-tools/messages"
+FILES_${PN}-dev += "/usr/lib/open-vm-tools/plugins/common/lib*.la"
+FILES_${PN}-dbg += "/usr/lib/open-vm-tools/plugins/common/.debug \
+		    /usr/lib/open-vm-tools/plugins/vmsvc/.debug"
+
+CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf"
+
+do_install_append() {
+    ln -sf /usr/sbin/mount.vmhgfs ${D}/sbin/mount.vmhgfs
+    install -d ${D}${systemd_unitdir}/system ${D}${sysconfdir}/vmware-tools
+    install -m 644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf
+}
+
+do_configure_prepend() {
+    export CUSTOM_PROCPS_NAME=procps
+    export CUSTOM_PROCPS_LIBS=-L${STAGING_LIBDIR}/libprocps.so
+}
-- 
2.11.0

[meta-oe][PATCH v2] 02/17] open-vm-tools: add missing pkgconfig dependency

[Martin Kelly]

The configure.ac script uses pkgconfig but we didn't depend on it, so it was
silently not using pkgconfig.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
index 4dee03a23..a68d48574 100644
--- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
+++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
@@ -29,7 +29,7 @@ S = "${WORKDIR}/git/open-vm-tools"
 DEPENDS = "virtual/kernel glib-2.0 util-linux libdnet procps libmspack"
 RDEPENDS_${PN} = "util-linux libdnet kernel-module-vmhgfs"
 
-inherit module-base kernel-module-split autotools systemd
+inherit module-base kernel-module-split autotools pkgconfig systemd
 
 # from module.bbclass...
 addtask make_scripts after do_patch before do_compile
-- 
2.11.0

[meta-oe][PATCH v2] 03/17] open-vm-tools: add missing glib-2.0-native dependency

[Martin Kelly]

glib-2.0-native is needed to find glib-genmarshal.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
index a68d48574..683f34eee 100644
--- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
+++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
@@ -26,7 +26,7 @@ SRCREV = "538ea037a1549b6fd4e57529f7448a3fd2aa47af"
 
 S = "${WORKDIR}/git/open-vm-tools"
 
-DEPENDS = "virtual/kernel glib-2.0 util-linux libdnet procps libmspack"
+DEPENDS = "virtual/kernel glib-2.0 glib-2.0-native util-linux libdnet procps libmspack"
 RDEPENDS_${PN} = "util-linux libdnet kernel-module-vmhgfs"
 
 inherit module-base kernel-module-split autotools pkgconfig systemd
-- 
2.11.0

[meta-oe][PATCH v2] 04/17] open-vm-tools: clarify and expand licensing

[Martin Kelly]

Userspace tools are licensed LGPLv2 and the kernel modules are various licenses
depending on the platform. Clarify this and add appropriate licensing variables.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
index 683f34eee..1142399df 100644
--- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
+++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
@@ -11,8 +11,14 @@
 
 DECRIPTION = "open-vm-tools"
 SECTION = "vmware-tools"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5804fe91d3294da4ac47c02b454bbc8a"
+
+LICENSE = "LGPLv2.1 & GPLv2 & BSD & CDDLv1"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0eac46f0b7886425d7faed6aae5aef66"
+LICENSE_modules/freebsd/vmblock = "BSD"
+LICENSE_modules/freebsd/vmmemctl = "GPLv2"
+LICENSE_modules/freebsd/vmxnet = "GPLv2"
+LICENSE_modules/linux = "GPLv2"
+LICENSE_modules/solaris = "CDDLv1"
 
 PR = "r5"
 
-- 
2.11.0

[meta-oe][PATCH v2] 05/17] open-vm-tools: base_contains --> bb.utils.contains

[Martin Kelly]

base_contains is deprecated, as the friendly warning reminds us.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
index 1142399df..9db43b0a1 100644
--- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
+++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
@@ -51,7 +51,7 @@ EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs --disable-tests
                 --disable-grabbitmqproxy --disable-vgauth --disable-deploypkg \
 		--with-linuxdir=${STAGING_KERNEL_DIR} --with-kernel-release=${KERNEL_VERSION} --without-root-privileges"
 
-EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'x11', '', '--without-x', d)}"
+EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '--without-x', d)}"
 
 EXTRA_OEMAKE = "KERNEL_RELEASE=${KERNEL_VERSION}"
 
-- 
2.11.0

[meta-oe][PATCH v2] 06/17] open-vm-tools: update version to 10.1.5

[Martin Kelly]

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 .../{open-vm-tools_10.0.5.bb => open-vm-tools_10.1.5.bb}            | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-support/open-vm-tools/{open-vm-tools_10.0.5.bb => open-vm-tools_10.1.5.bb} (95%)

diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
similarity index 95%
rename from meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
rename to meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
index 9db43b0a1..8a71cb3b6 100644
--- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb
+++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
@@ -13,22 +13,20 @@ DECRIPTION = "open-vm-tools"
 SECTION = "vmware-tools"
 
 LICENSE = "LGPLv2.1 & GPLv2 & BSD & CDDLv1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0eac46f0b7886425d7faed6aae5aef66"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b66ba4cb4fc017682c95efc300410e79"
 LICENSE_modules/freebsd/vmblock = "BSD"
 LICENSE_modules/freebsd/vmmemctl = "GPLv2"
 LICENSE_modules/freebsd/vmxnet = "GPLv2"
 LICENSE_modules/linux = "GPLv2"
 LICENSE_modules/solaris = "CDDLv1"
 
-PR = "r5"
-
 SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \
            file://tools.conf \
            file://vmtoolsd.service \
            file://0001-Fix-kernel-detection.patch \
            "
 
-SRCREV = "538ea037a1549b6fd4e57529f7448a3fd2aa47af"
+SRCREV = "854c0bb374612f7e633b448ca273f970f154458b"
 
 S = "${WORKDIR}/git/open-vm-tools"
 
-- 
2.11.0

[meta-oe][PATCH v2] 07/17] open-vm-tools: don't use mspack

[Martin Kelly]

It's not actually needed when you set --disable-deploypkg.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8a71cb3b6..6793d450b 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
@@ -30,7 +30,7 @@ SRCREV = "854c0bb374612f7e633b448ca273f970f154458b"
 
 S = "${WORKDIR}/git/open-vm-tools"
 
-DEPENDS = "virtual/kernel glib-2.0 glib-2.0-native util-linux libdnet procps libmspack"
+DEPENDS = "virtual/kernel glib-2.0 glib-2.0-native util-linux libdnet procps"
 RDEPENDS_${PN} = "util-linux libdnet kernel-module-vmhgfs"
 
 inherit module-base kernel-module-split autotools pkgconfig systemd
-- 
2.11.0

[meta-oe][PATCH v2] 08/17] open-vm-tools: don't use dnet-config

[Martin Kelly]

dnet-config wasn't found in the PATH, and it doesn't work properly for
cross-compile anyway.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 .../0002-configure.ac-don-t-use-dnet-config.patch  | 41 ++++++++++++++++++++++
 .../open-vm-tools/open-vm-tools_10.1.5.bb          |  3 ++
 2 files changed, 44 insertions(+)
 create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch

diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch
new file mode 100644
index 000000000..e9cb873f1
--- /dev/null
+++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch
@@ -0,0 +1,41 @@
+From 929150608c16644695f19cd2e0cc8a06a41cd497 Mon Sep 17 00:00:00 2001
+From: Martin Kelly <mkelly@xevo.com>
+Date: Fri, 7 Apr 2017 15:20:30 -0700
+Subject: [PATCH] configure.ac: don't use dnet-config
+
+The dnet-config tool doesn't know about cross-compilation, so it injects
+-I/usr/include into the path, causing compiler errors. So instead find dnet via
+-ldnet.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Martin Kelly <mkelly@xevo.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3400b86..7d6119e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -942,7 +942,7 @@ if test "$with_dnet" = "yes"; then
+       AC_VMW_CHECK_LIB([dnet],
+                        [DNET],
+                        [],
+-                       [dnet-config],
++                       [],
+                        [],
+                        [dnet.h],
+                        [intf_open],
+@@ -952,7 +952,7 @@ if test "$with_dnet" = "yes"; then
+ 
+    if test $have_dnet = "no"; then
+ 		AC_MSG_ERROR(
+-		   [dnet-config was not found on your PATH. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net])
++		   [dnet was not found. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net])
+ 	fi
+ fi
+ 
+-- 
+2.1.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 6793d450b..b3e0afca7 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
@@ -24,6 +24,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \
            file://tools.conf \
            file://vmtoolsd.service \
            file://0001-Fix-kernel-detection.patch \
+           file://0002-configure.ac-don-t-use-dnet-config.patch \
            "
 
 SRCREV = "854c0bb374612f7e633b448ca273f970f154458b"
@@ -76,4 +77,6 @@ do_install_append() {
 do_configure_prepend() {
     export CUSTOM_PROCPS_NAME=procps
     export CUSTOM_PROCPS_LIBS=-L${STAGING_LIBDIR}/libprocps.so
+    export CUSTOM_DNET_NAME=dnet
+    export CUSTOM_DNET_LIBS=-L${STAGING_LIBDIR}/libdnet.so
 }
-- 
2.11.0

[meta-oe][PATCH v2] 09/17] open-vm-tools: add #include to fix build break

[Martin Kelly]

Signed-off-by: Martin Kelly <mkelly@xevo.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(+)
 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 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 @@
+From 5818acc8032e3247257730376e947330340a07b3 Mon Sep 17 00:00:00 2001
+From: Martin Kelly <mkelly@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@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 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 \
            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"
-- 
2.11.0

[meta-oe][PATCH v2] 10/17] open-vm-tools: add missing X11 dependencies

[Martin Kelly]

Certain dependencies that are implied when we build with X11 support -- such as
libxext -- were missing. Add them, and meanwhile switch to using
PACKAGECONFIG[x11] instead of DISTRO_FEATURES.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 2b2022864..76d3840e6 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
@@ -47,11 +47,13 @@ KERNEL_MODULES_META_PACKAGE = "${PN}"
 SYSTEMD_SERVICE_${PN} = "vmtoolsd.service"
 
 EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs --disable-tests \
-		--without-gtk2 --without-gtkmm --without-xerces --without-pam \
+		--without-gtkmm --without-xerces --without-pam \
                 --disable-grabbitmqproxy --disable-vgauth --disable-deploypkg \
 		--with-linuxdir=${STAGING_KERNEL_DIR} --with-kernel-release=${KERNEL_VERSION} --without-root-privileges"
 
-EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '--without-x', d)}"
+NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3"
+X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf"
+PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}"
 
 EXTRA_OEMAKE = "KERNEL_RELEASE=${KERNEL_VERSION}"
 
-- 
2.11.0

[meta-oe][PATCH v2] 11/17] open-vm-tools: remove kernel module logic

[Martin Kelly]

All the modules are upstream for Linux >= 4.0, so no modules are being built
anyway. We can safely remove the build logic for them.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 .../open-vm-tools/0001-Fix-kernel-detection.patch  | 35 ----------------------
 ... 0001-configure.ac-don-t-use-dnet-config.patch} |  0
 ...atch => 0002-add-include-sys-sysmacros.h.patch} |  0
 .../open-vm-tools/open-vm-tools_10.1.5.bb          | 23 ++++----------
 4 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-kernel-detection.patch
 rename meta-oe/recipes-support/open-vm-tools/open-vm-tools/{0002-configure.ac-don-t-use-dnet-config.patch => 0001-configure.ac-don-t-use-dnet-config.patch} (100%)
 rename meta-oe/recipes-support/open-vm-tools/open-vm-tools/{0003-add-include-sys-sysmacros.h.patch => 0002-add-include-sys-sysmacros.h.patch} (100%)

diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-kernel-detection.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-kernel-detection.patch
deleted file mode 100644
index 63ea45324..000000000
--- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-kernel-detection.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5d8814f4b4f016a633984822a6dfbc9426fef333 Mon Sep 17 00:00:00 2001
-From: Diego Dompe <dompe@hpe.com>
-Date: Thu, 7 Jan 2016 15:06:16 -0600
-Subject: [PATCH] Fix-kernel-detection
-
-Signed-off-by: Diego Dompe <dompe@hpe.com>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 04e3bac..1ab3f29 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -151,7 +151,7 @@ if test "$with_kernel_modules" = "yes"; then
-          if test ! -d "$LINUXDIR/kernel/"; then
-              AC_MSG_ERROR([$LINUXDIR/kernel does not exist])
-          fi
--         LINUXINCLUDE="$LINUXDIR/build/include"
-+         LINUXINCLUDE="$LINUXDIR/include"
-          if test ! -d "$LINUXINCLUDE"; then
-             AC_MSG_ERROR([Can't find include dir under $LINUXDIR])
-          fi
-@@ -1034,7 +1034,7 @@ MODULES_DIR=""
- buildHgfsmounter=no
- 
- if test "$os" = "linux"; then
--   MODULES_DIR="$LINUXDIR/kernel/"
-+   MODULES_DIR="/lib/modules/$KERNEL_RELEASE"
- 
-    CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
-    CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
--- 
-1.9.1
-
diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch
similarity index 100%
rename from meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch
rename to meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.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/0002-add-include-sys-sysmacros.h.patch
similarity index 100%
rename from meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-add-include-sys-sysmacros.h.patch
rename to meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch
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 76d3840e6..24c8e9300 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
@@ -23,41 +23,30 @@ LICENSE_modules/solaris = "CDDLv1"
 SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \
            file://tools.conf \
            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 \
+           file://0001-configure.ac-don-t-use-dnet-config.patch \
+           file://0002-add-include-sys-sysmacros.h.patch \
            "
 
 SRCREV = "854c0bb374612f7e633b448ca273f970f154458b"
 
 S = "${WORKDIR}/git/open-vm-tools"
 
-DEPENDS = "virtual/kernel glib-2.0 glib-2.0-native util-linux libdnet procps"
-RDEPENDS_${PN} = "util-linux libdnet kernel-module-vmhgfs"
+DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps"
+RDEPENDS_${PN} = "util-linux libdnet"
 
-inherit module-base kernel-module-split autotools pkgconfig systemd
-
-# from module.bbclass...
-addtask make_scripts after do_patch before do_compile
-do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
-do_make_scripts[depends] = "virtual/kernel:do_shared_workdir"
-# add all splitted modules to PN RDEPENDS, PN can be empty now
-KERNEL_MODULES_META_PACKAGE = "${PN}"
+inherit autotools pkgconfig systemd
 
 SYSTEMD_SERVICE_${PN} = "vmtoolsd.service"
 
 EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs --disable-tests \
 		--without-gtkmm --without-xerces --without-pam \
                 --disable-grabbitmqproxy --disable-vgauth --disable-deploypkg \
-		--with-linuxdir=${STAGING_KERNEL_DIR} --with-kernel-release=${KERNEL_VERSION} --without-root-privileges"
+		--without-root-privileges --without-kernel-modules"
 
 NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3"
 X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf"
 PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}"
 
-EXTRA_OEMAKE = "KERNEL_RELEASE=${KERNEL_VERSION}"
-
-
 CFLAGS += '-Wno-error=deprecated-declarations'
 
 FILES_${PN} += "/usr/lib/open-vm-tools/plugins/vmsvc/lib*.so \
-- 
2.11.0

[meta-oe][PATCH v2] 12/17] open-vm-tools: line up configure options

[Martin Kelly]

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 24c8e9300..c3cb9d567 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
@@ -38,10 +38,10 @@ inherit autotools pkgconfig systemd
 
 SYSTEMD_SERVICE_${PN} = "vmtoolsd.service"
 
-EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs --disable-tests \
-		--without-gtkmm --without-xerces --without-pam \
+EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \
+                --disable-tests --without-gtkmm --without-xerces --without-pam \
                 --disable-grabbitmqproxy --disable-vgauth --disable-deploypkg \
-		--without-root-privileges --without-kernel-modules"
+                --without-root-privileges --without-kernel-modules"
 
 NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3"
 X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf"
-- 
2.11.0

[meta-oe][PATCH v2] 13/17] open-vm-tools: support FUSE

[Martin Kelly]

The vmhgfs driver is now gone, but they use FUSE instead. Add FUSE support so we
don't lose the functionality vmhgfs use to provide.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb | 3 +++
 1 file changed, 3 insertions(+)

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 c3cb9d567..7d024f260 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
@@ -47,6 +47,9 @@ NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3"
 X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf"
 PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}"
 
+# fuse gets implicitly detected; there is no --without-fuse option.
+PACKAGECONFIG[fuse] = ",,fuse"
+
 CFLAGS += '-Wno-error=deprecated-declarations'
 
 FILES_${PN} += "/usr/lib/open-vm-tools/plugins/vmsvc/lib*.so \
-- 
2.11.0

[meta-oe][PATCH v2] 14/17] open-vm-tools: scope build to only x86

[Martin Kelly]

Since open-vm-tools builds only on x86, set COMPATIBLE_HOST to reflect
this.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb | 3 +++
 1 file changed, 3 insertions(+)

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 7d024f260..906eaba64 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
@@ -34,6 +34,9 @@ S = "${WORKDIR}/git/open-vm-tools"
 DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps"
 RDEPENDS_${PN} = "util-linux libdnet"
 
+# open-vm-tools is supported only on x86.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux'
+
 inherit autotools pkgconfig systemd
 
 SYSTEMD_SERVICE_${PN} = "vmtoolsd.service"
-- 
2.11.0

[meta-oe][PATCH v2] 15/17] open-vm-tools: style changes

[Martin Kelly]

Various cosmetic changes to make the recipe match the style guide:

http://www.openembedded.org/wiki/Styleguide

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 .../open-vm-tools/open-vm-tools_10.1.5.bb          | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

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 906eaba64..4ab2820c1 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
@@ -9,7 +9,8 @@
 # in meta-openembedded by agreement of the author (Diego Dompe).
 #
 
-DECRIPTION = "open-vm-tools"
+SUMMARY = "Tools to enhance VMWare guest integration and performance"
+HOMEPAGE = "https://github.com/vmware/open-vm-tools"
 SECTION = "vmware-tools"
 
 LICENSE = "LGPLv2.1 & GPLv2 & BSD & CDDLv1"
@@ -32,7 +33,6 @@ SRCREV = "854c0bb374612f7e633b448ca273f970f154458b"
 S = "${WORKDIR}/git/open-vm-tools"
 
 DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps"
-RDEPENDS_${PN} = "util-linux libdnet"
 
 # open-vm-tools is supported only on x86.
 COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux'
@@ -53,18 +53,24 @@ PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}"
 # fuse gets implicitly detected; there is no --without-fuse option.
 PACKAGECONFIG[fuse] = ",,fuse"
 
-CFLAGS += '-Wno-error=deprecated-declarations'
+CFLAGS += "-Wno-error=deprecated-declarations"
 
-FILES_${PN} += "/usr/lib/open-vm-tools/plugins/vmsvc/lib*.so \
-		/usr/lib/open-vm-tools/plugins/common/lib*.so \
-    ${sysconfdir}/vmware-tools/tools.conf"
+FILES_${PN} += "\
+    /usr/lib/open-vm-tools/plugins/vmsvc/lib*.so \
+    /usr/lib/open-vm-tools/plugins/common/lib*.so \
+    ${sysconfdir}/vmware-tools/tools.conf \
+    "
 FILES_${PN}-locale += "/usr/share/open-vm-tools/messages"
 FILES_${PN}-dev += "/usr/lib/open-vm-tools/plugins/common/lib*.la"
-FILES_${PN}-dbg += "/usr/lib/open-vm-tools/plugins/common/.debug \
-		    /usr/lib/open-vm-tools/plugins/vmsvc/.debug"
+FILES_${PN}-dbg += "\
+    /usr/lib/open-vm-tools/plugins/common/.debug \
+    /usr/lib/open-vm-tools/plugins/vmsvc/.debug \
+    "
 
 CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf"
 
+RDEPENDS_${PN} = "util-linux libdnet fuse"
+
 do_install_append() {
     ln -sf /usr/sbin/mount.vmhgfs ${D}/sbin/mount.vmhgfs
     install -d ${D}${systemd_unitdir}/system ${D}${sysconfdir}/vmware-tools
-- 
2.11.0

[meta-oe][PATCH v2] 16/17] open-vm-tools: fix all hardcoded paths

[Martin Kelly]

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 .../recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 4ab2820c1..2a83e864f 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
@@ -56,15 +56,15 @@ PACKAGECONFIG[fuse] = ",,fuse"
 CFLAGS += "-Wno-error=deprecated-declarations"
 
 FILES_${PN} += "\
-    /usr/lib/open-vm-tools/plugins/vmsvc/lib*.so \
-    /usr/lib/open-vm-tools/plugins/common/lib*.so \
+    ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \
+    ${libdir}/open-vm-tools/plugins/common/lib*.so \
     ${sysconfdir}/vmware-tools/tools.conf \
     "
-FILES_${PN}-locale += "/usr/share/open-vm-tools/messages"
-FILES_${PN}-dev += "/usr/lib/open-vm-tools/plugins/common/lib*.la"
+FILES_${PN}-locale += "${datadir}/open-vm-tools/messages"
+FILES_${PN}-dev += "${libdir}/open-vm-tools/plugins/common/lib*.la"
 FILES_${PN}-dbg += "\
-    /usr/lib/open-vm-tools/plugins/common/.debug \
-    /usr/lib/open-vm-tools/plugins/vmsvc/.debug \
+    ${libdir}/open-vm-tools/plugins/common/.debug \
+    ${libdir}/open-vm-tools/plugins/vmsvc/.debug \
     "
 
 CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf"
@@ -72,7 +72,7 @@ CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf"
 RDEPENDS_${PN} = "util-linux libdnet fuse"
 
 do_install_append() {
-    ln -sf /usr/sbin/mount.vmhgfs ${D}/sbin/mount.vmhgfs
+    ln -sf ${sbindir}/mount.vmhgfs ${D}/sbin/mount.vmhgfs
     install -d ${D}${systemd_unitdir}/system ${D}${sysconfdir}/vmware-tools
     install -m 644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf
-- 
2.11.0

[meta-oe][PATCH v2] 17/17] open-vm-tools: remove -Wno-error

[Martin Kelly]

In the past, we compiled with -Wno-error=deprecated-declarations, but
the current version compiles fine without it, so remove it.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
---
 meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb | 2 --
 1 file changed, 2 deletions(-)

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 2a83e864f..65fbfc9e9 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
@@ -53,8 +53,6 @@ PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}"
 # fuse gets implicitly detected; there is no --without-fuse option.
 PACKAGECONFIG[fuse] = ",,fuse"
 
-CFLAGS += "-Wno-error=deprecated-declarations"
-
 FILES_${PN} += "\
     ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \
     ${libdir}/open-vm-tools/plugins/common/lib*.so \
-- 
2.11.0

Re: [meta-oe][PATCH v2] 00/17] new recipe v2: open-vm-tools recipe

[Martin Kelly]

(ping)

I mistyped a character, so the patches did not correctly show up on 
Patchwork (sorry!).

On 06/23/2017 03:47 PM, Martin Kelly wrote:
> Hi all,
>
> This is version 2 of a patch series to add a new recipe for Open VM Tools to
> meta-oe. This recipe is invaluable for using Openembedded with VMWare, as
> without the tools, performance is very slow.
>
> More information about Open VM Tools can be found here:
>
> https://github.com/vmware/open-vm-tools
>
> Please note that, as mentioned in the first commit, this recipe is modified
> from the recipe originally found in the Open-Switch repository. The first
> patch is directly from that repository, and the following patches are
> modifications to it.
>
> Original recipe: https://github.com/open-switch/ops-build
> yocto/openswitch/meta-foss-openswitch/recipes-extended/open-vm-tools/open-vm-tools_10.0.5.bb
> Commit 9008de2d8e100f3f868c66765742bca9fa98f3f9
>
> Although the original recipe packaging was Apache-licensed, I received
> permission from the author (Diego Dompe) to relicense it under the MIT license
> for inclusion in meta-openembedded:
>
> https://lists.openswitch.net/pipermail/ops-dev/2017-April/014715.html
> https://lists.openswitch.net/pipermail/ops-dev/2017-April/014716.html
>
> The following changes since commit d2da8b82cfb2f8e55236751c1c56c9e7f3b5f68d:
>
>   scsirastools: Upgrade to 1.6.6 (2017-06-22 16:04:14 +0200)
>
> are available in the git repository at:
>
>   git://github.com/XevoInc/meta-openembedded open-vm-tools-v2
>   https://github.com/XevoInc/meta-openembedded/tree/open-vm-tools-v2
>
> Martin Kelly (17):
>   add open-vm-tools recipe
>   open-vm-tools: add missing pkgconfig dependency
>   open-vm-tools: add missing glib-2.0-native dependency
>   open-vm-tools: clarify and expand licensing
>   open-vm-tools: base_contains --> bb.utils.contains
>   open-vm-tools: update version to 10.1.5
>   open-vm-tools: don't use mspack
>   open-vm-tools: don't use dnet-config
>   open-vm-tools: add #include to fix build break
>   open-vm-tools: add missing X11 dependencies
>   open-vm-tools: remove kernel module logic
>   open-vm-tools: line up configure options
>   open-vm-tools: support FUSE
>   open-vm-tools: scope build to only x86
>   open-vm-tools: style changes
>   open-vm-tools: fix all hardcoded paths
>   open-vm-tools: remove -Wno-error
>
>  .../recipes-support/open-vm-tools/files/tools.conf |  2 +
>  .../open-vm-tools/files/vmtoolsd.service           | 11 +++
>  .../0001-configure.ac-don-t-use-dnet-config.patch  | 41 +++++++++++
>  .../0002-add-include-sys-sysmacros.h.patch         | 33 +++++++++
>  .../open-vm-tools/open-vm-tools_10.1.5.bb          | 84 ++++++++++++++++++++++
>  5 files changed, 171 insertions(+)
>  create mode 100644 meta-oe/recipes-support/open-vm-tools/files/tools.conf
>  create mode 100644 meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service
>  create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch
>  create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch
>  create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
>

Re: [meta-oe][PATCH v2] 00/17] new recipe v2: open-vm-tools recipe

[Martin Jansa]

It's already in master-next waiting for jenkins builds to finish.

On Wed, Jun 28, 2017 at 12:24 AM, Martin Kelly <mkelly@xevo.com> wrote:

> (ping)
>
> I mistyped a character, so the patches did not correctly show up on
> Patchwork (sorry!).
>
>
> On 06/23/2017 03:47 PM, Martin Kelly wrote:
>
>> Hi all,
>>
>> This is version 2 of a patch series to add a new recipe for Open VM Tools
>> to
>> meta-oe. This recipe is invaluable for using Openembedded with VMWare, as
>> without the tools, performance is very slow.
>>
>> More information about Open VM Tools can be found here:
>>
>> https://github.com/vmware/open-vm-tools
>>
>> Please note that, as mentioned in the first commit, this recipe is
>> modified
>> from the recipe originally found in the Open-Switch repository. The first
>> patch is directly from that repository, and the following patches are
>> modifications to it.
>>
>> Original recipe: https://github.com/open-switch/ops-build
>> yocto/openswitch/meta-foss-openswitch/recipes-extended/open-vm-tools/
>> open-vm-tools_10.0.5.bb
>> Commit 9008de2d8e100f3f868c66765742bca9fa98f3f9
>>
>> Although the original recipe packaging was Apache-licensed, I received
>> permission from the author (Diego Dompe) to relicense it under the MIT
>> license
>> for inclusion in meta-openembedded:
>>
>> https://lists.openswitch.net/pipermail/ops-dev/2017-April/014715.html
>> https://lists.openswitch.net/pipermail/ops-dev/2017-April/014716.html
>>
>> The following changes since commit d2da8b82cfb2f8e55236751c1c56c9
>> e7f3b5f68d:
>>
>>   scsirastools: Upgrade to 1.6.6 (2017-06-22 16:04:14 +0200)
>>
>> are available in the git repository at:
>>
>>   git://github.com/XevoInc/meta-openembedded open-vm-tools-v2
>>   https://github.com/XevoInc/meta-openembedded/tree/open-vm-tools-v2
>>
>> Martin Kelly (17):
>>   add open-vm-tools recipe
>>   open-vm-tools: add missing pkgconfig dependency
>>   open-vm-tools: add missing glib-2.0-native dependency
>>   open-vm-tools: clarify and expand licensing
>>   open-vm-tools: base_contains --> bb.utils.contains
>>   open-vm-tools: update version to 10.1.5
>>   open-vm-tools: don't use mspack
>>   open-vm-tools: don't use dnet-config
>>   open-vm-tools: add #include to fix build break
>>   open-vm-tools: add missing X11 dependencies
>>   open-vm-tools: remove kernel module logic
>>   open-vm-tools: line up configure options
>>   open-vm-tools: support FUSE
>>   open-vm-tools: scope build to only x86
>>   open-vm-tools: style changes
>>   open-vm-tools: fix all hardcoded paths
>>   open-vm-tools: remove -Wno-error
>>
>>  .../recipes-support/open-vm-tools/files/tools.conf |  2 +
>>  .../open-vm-tools/files/vmtoolsd.service           | 11 +++
>>  .../0001-configure.ac-don-t-use-dnet-config.patch  | 41 +++++++++++
>>  .../0002-add-include-sys-sysmacros.h.patch         | 33 +++++++++
>>  .../open-vm-tools/open-vm-tools_10.1.5.bb          | 84
>> ++++++++++++++++++++++
>>  5 files changed, 171 insertions(+)
>>  create mode 100644 meta-oe/recipes-support/open-v
>> m-tools/files/tools.conf
>>  create mode 100644 meta-oe/recipes-support/open-v
>> m-tools/files/vmtoolsd.service
>>  create mode 100644 meta-oe/recipes-support/open-v
>> m-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch
>>  create mode 100644 meta-oe/recipes-support/open-v
>> m-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch
>>  create mode 100644 meta-oe/recipes-support/open-vm-tools/
>> open-vm-tools_10.1.5.bb
>>
>>

Re: [meta-oe][PATCH v2] 00/17] new recipe v2: open-vm-tools recipe

[Martin Kelly]

Ah, thanks. It looks like the commits picked up some garbage (again a 
relic of me missing a characeter in the send-pull-request invocation):

commit 18dd8d0:
01/17] add open-vm-tools recipe

Once you merge to master, could you remove the "01/17" prefixes?

On 06/27/2017 03:29 PM, Martin Jansa wrote:
> It's already in master-next waiting for jenkins builds to finish.
>
> On Wed, Jun 28, 2017 at 12:24 AM, Martin Kelly <mkelly@xevo.com
> <mailto:mkelly@xevo.com>> wrote:
>
>     (ping)
>
>     I mistyped a character, so the patches did not correctly show up on
>     Patchwork (sorry!).
>
>
>     On 06/23/2017 03:47 PM, Martin Kelly wrote:
>
>         Hi all,
>
>         This is version 2 of a patch series to add a new recipe for Open
>         VM Tools to
>         meta-oe. This recipe is invaluable for using Openembedded with
>         VMWare, as
>         without the tools, performance is very slow.
>
>         More information about Open VM Tools can be found here:
>
>         https://github.com/vmware/open-vm-tools
>         <https://github.com/vmware/open-vm-tools>
>
>         Please note that, as mentioned in the first commit, this recipe
>         is modified
>         from the recipe originally found in the Open-Switch repository.
>         The first
>         patch is directly from that repository, and the following
>         patches are
>         modifications to it.
>
>         Original recipe: https://github.com/open-switch/ops-build
>         <https://github.com/open-switch/ops-build>
>         yocto/openswitch/meta-foss-openswitch/recipes-extended/open-vm-tools/open-vm-tools_10.0.5.bb
>         <http://open-vm-tools_10.0.5.bb>
>         Commit 9008de2d8e100f3f868c66765742bca9fa98f3f9
>
>         Although the original recipe packaging was Apache-licensed, I
>         received
>         permission from the author (Diego Dompe) to relicense it under
>         the MIT license
>         for inclusion in meta-openembedded:
>
>         https://lists.openswitch.net/pipermail/ops-dev/2017-April/014715.html
>         <https://lists.openswitch.net/pipermail/ops-dev/2017-April/014715.html>
>         https://lists.openswitch.net/pipermail/ops-dev/2017-April/014716.html
>         <https://lists.openswitch.net/pipermail/ops-dev/2017-April/014716.html>
>
>         The following changes since commit
>         d2da8b82cfb2f8e55236751c1c56c9e7f3b5f68d:
>
>           scsirastools: Upgrade to 1.6.6 (2017-06-22 16:04:14 +0200)
>
>         are available in the git repository at:
>
>           git://github.com/XevoInc/meta-openembedded
>         <http://github.com/XevoInc/meta-openembedded> open-vm-tools-v2
>
>         https://github.com/XevoInc/meta-openembedded/tree/open-vm-tools-v2
>         <https://github.com/XevoInc/meta-openembedded/tree/open-vm-tools-v2>
>
>         Martin Kelly (17):
>           add open-vm-tools recipe
>           open-vm-tools: add missing pkgconfig dependency
>           open-vm-tools: add missing glib-2.0-native dependency
>           open-vm-tools: clarify and expand licensing
>           open-vm-tools: base_contains --> bb.utils.contains
>           open-vm-tools: update version to 10.1.5
>           open-vm-tools: don't use mspack
>           open-vm-tools: don't use dnet-config
>           open-vm-tools: add #include to fix build break
>           open-vm-tools: add missing X11 dependencies
>           open-vm-tools: remove kernel module logic
>           open-vm-tools: line up configure options
>           open-vm-tools: support FUSE
>           open-vm-tools: scope build to only x86
>           open-vm-tools: style changes
>           open-vm-tools: fix all hardcoded paths
>           open-vm-tools: remove -Wno-error
>
>          .../recipes-support/open-vm-tools/files/tools.conf |  2 +
>          .../open-vm-tools/files/vmtoolsd.service           | 11 +++
>          .../0001-configure.ac-don-t-use-dnet-config.patch  | 41 +++++++++++
>          .../0002-add-include-sys-sysmacros.h.patch         | 33 +++++++++
>          .../open-vm-tools/open-vm-tools_10.1.5.bb
>         <http://open-vm-tools_10.1.5.bb>          | 84
>         ++++++++++++++++++++++
>          5 files changed, 171 insertions(+)
>          create mode 100644
>         meta-oe/recipes-support/open-vm-tools/files/tools.conf
>          create mode 100644
>         meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service
>          create mode 100644
>         meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch
>          create mode 100644
>         meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch
>          create mode 100644
>         meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
>         <http://open-vm-tools_10.1.5.bb>
>
>