diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-11.3.0-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch similarity index 55% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-11.3.0-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch rename to sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch index e4f760825e..60bd09a383 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-11.3.0-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch @@ -1,17 +1,17 @@ -From a5c17c107ac1e88c664dd26e49bf9eb8635a4462 Mon Sep 17 00:00:00 2001 +From d41aae8430eb0148dda9f71f311626bbe779d115 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 21 Mar 2017 16:04:30 -0700 Subject: [PATCH] configure: Add options for fuse, hgfs, and udev --- - open-vm-tools/configure.ac | 24 +++++++++++++++++++++++- - 1 file changed, 23 insertions(+), 1 deletion(-) + open-vm-tools/configure.ac | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index b283ebe8..777b38af 100644 +index ab315b84..33839087 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac -@@ -471,6 +471,13 @@ fi +@@ -519,6 +519,13 @@ fi # # Check for fuse. # @@ -25,7 +25,7 @@ index b283ebe8..777b38af 100644 AC_VMW_CHECK_LIB([fuse], [FUSE], [fuse], -@@ -481,6 +488,7 @@ AC_VMW_CHECK_LIB([fuse], +@@ -529,6 +536,7 @@ AC_VMW_CHECK_LIB([fuse], [have_fuse=yes], [have_fuse=no; AC_MSG_WARN([Fuse is missing, vmblock-fuse/vmhgfs-fuse will be disabled.])]) @@ -33,7 +33,7 @@ index b283ebe8..777b38af 100644 # # Check for PAM. -@@ -1347,7 +1355,13 @@ if test "$os" = "solaris"; then +@@ -1425,7 +1433,13 @@ if test "$os" = "solaris"; then fi fi @@ -48,21 +48,6 @@ index b283ebe8..777b38af 100644 have_udev="yes" AC_ARG_WITH([udev-rules-dir], [AS_HELP_STRING([--with-udev-rules-dir=DIR], -@@ -1375,6 +1389,14 @@ if test "x$enable_resolutionkms" = "xyes"; then - CPPFLAGS="$CPPFLAGS -DENABLE_RESOLUTIONKMS" - fi - -+if test "$buildHgfsmounter" = "yes"; then -+ AC_ARG_ENABLE([hgfs-mounter], -+ [AS_HELP_STRING([--disable-hgfs-mounter], -+ [disables mount.vmhgfs])], -+ [buildHgfsmounter="$enableval"], -+ []) -+fi -+ - AM_CONDITIONAL(BUILD_HGFSMOUNTER, test "$buildHgfsmounter" = "yes") - AM_CONDITIONAL(LINUX, test "$os" = "linux") - AM_CONDITIONAL(SOLARIS, test "$os" = "solaris") -- -2.17.0 +2.26.3 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-11.3.5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-11.3.5.ebuild index be7387067c..2f0066dcab 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-11.3.5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-11.3.5.ebuild @@ -30,7 +30,7 @@ RDEPEND="dnet? ( dev-libs/libdnet ) S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}/${P}-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch" + "${FILESDIR}/${PN}-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch" ) src_prepare() { @@ -73,7 +73,6 @@ src_configure() { --prefix=/usr/share/oem $(use_enable deploypkg) --disable-docs - --disable-hgfs-mounter --disable-multimon --disable-tests --without-fuse