From 7b6d32361c7633d6f96367c243620d395842c82b Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Tue, 23 Jun 2015 13:34:32 -0700 Subject: [PATCH] app-emulation/open-vm-tools: Add back --with-fuse Commit 1adfcba3b7e075151d4ca5f43c891532f6a2d98c (app-emulation/open-vm-tools: bump to 9.10.0) removed the local patch that added--with-fuse and --with-hgfs configure options. These local options are needed to avoid any dependency on these packages. Signed-off-by: Geoff Levand --- ...figure-Add-options-for-fuse-and-hgfs.patch | 53 +++++++++++++++++++ ....ebuild => open-vm-tools-9.10.0-r1.ebuild} | 4 ++ 2 files changed, 57 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-9.10.0-0001-configure-Add-options-for-fuse-and-hgfs.patch rename sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/{open-vm-tools-9.10.0.ebuild => open-vm-tools-9.10.0-r1.ebuild} (97%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-9.10.0-0001-configure-Add-options-for-fuse-and-hgfs.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-9.10.0-0001-configure-Add-options-for-fuse-and-hgfs.patch new file mode 100644 index 0000000000..4cf8c02954 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-9.10.0-0001-configure-Add-options-for-fuse-and-hgfs.patch @@ -0,0 +1,53 @@ +From aa50490f8dcb3111f49035bd8ed85bf47f304f31 Mon Sep 17 00:00:00 2001 +From: Michael Marineau +Date: Sun, 30 Mar 2014 20:28:05 -0700 +Subject: [PATCH 1/3] configure: Add options for fuse and hgfs + +--- + configure.ac | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 549736f..4964364 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -355,6 +355,13 @@ fi + # + # Check for fuse. + # ++AC_ARG_WITH([fuse], ++ [AS_HELP_STRING([--without-fuse], ++ [compiles without fuse support.])], ++ [], ++ [with_fuse=yes]) ++ ++if test "$with_fuse" = "yes"; then + AC_VMW_CHECK_LIB([fuse], + [FUSE], + [fuse], +@@ -365,6 +372,7 @@ AC_VMW_CHECK_LIB([fuse], + [have_fuse=yes], + [have_fuse=no; + AC_MSG_WARN([Fuse is missing, vmblock-fuse will be disabled.])]) ++fi + + # + # Check for PAM. +@@ -1013,6 +1021,14 @@ if test "$os" = "solaris"; then + fi + 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.0.4 + diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.10.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.10.0-r1.ebuild similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.10.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.10.0-r1.ebuild index f4fa32c929..a2de736233 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.10.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.10.0-r1.ebuild @@ -35,6 +35,10 @@ RDEPEND="dnet? ( dev-libs/libdnet ) S="${WORKDIR}/${PN}" +PATCHES=( + "${FILESDIR}/${P}-0001-configure-Add-options-for-fuse-and-hgfs.patch" +) + #pkg_setup() { # enewgroup vmware #}