From 4c784642cbf77558aa9d85034dfc541138d0a6e8 Mon Sep 17 00:00:00 2001 From: Yuhei OKAWA Date: Fri, 15 Mar 2019 10:53:52 +0900 Subject: [PATCH] open-vm-tools: remove resolutionkms fix snapshot build err. Add configure option "--enable-resolutionkms=no" Can not build if libdrm and libudev exist. Since resolutionkms is not used, it is avoided by disabling it. Signed-off-by: Yuhei OKAWA --- utils/open-vm-tools/Makefile | 6 +++--- .../patches/0013-fsutil_use_typedef_loff_t.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 utils/open-vm-tools/patches/0013-fsutil_use_typedef_loff_t.patch diff --git a/utils/open-vm-tools/Makefile b/utils/open-vm-tools/Makefile index f4aa4eaacf..9f63758eb1 100644 --- a/utils/open-vm-tools/Makefile +++ b/utils/open-vm-tools/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=open-vm-tools PKG_VERSION:=10.3.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-10430147.tar.gz PKG_SOURCE_URL:=https://github.com/vmware/open-vm-tools/releases/download/stable-$(PKG_VERSION) @@ -56,7 +56,8 @@ CONFIGURE_ARGS+= \ --without-x \ --without-gtk2 \ --without-gtk3 \ - --without-xerces + --without-xerces \ + --enable-resolutionkms=no define Package/open-vm-tools/install @@ -92,7 +93,6 @@ define Package/open-vm-tools/install $(INSTALL_DIR) $(1)/usr/lib/open-vm-tools/plugins/vmsvc/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/open-vm-tools/plugins/vmsvc/libguestInfo.so $(1)/usr/lib/open-vm-tools/plugins/vmsvc/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/open-vm-tools/plugins/vmsvc/libpowerOps.so $(1)/usr/lib/open-vm-tools/plugins/vmsvc/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/open-vm-tools/plugins/vmsvc/libresolutionKMS.so $(1)/usr/lib/open-vm-tools/plugins/vmsvc/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so $(1)/usr/lib/open-vm-tools/plugins/vmsvc/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/open-vm-tools/plugins/vmsvc/libvmbackup.so $(1)/usr/lib/open-vm-tools/plugins/vmsvc/ diff --git a/utils/open-vm-tools/patches/0013-fsutil_use_typedef_loff_t.patch b/utils/open-vm-tools/patches/0013-fsutil_use_typedef_loff_t.patch new file mode 100644 index 0000000000..e8b8be8403 --- /dev/null +++ b/utils/open-vm-tools/patches/0013-fsutil_use_typedef_loff_t.patch @@ -0,0 +1,12 @@ +--- a/vmhgfs-fuse/fsutil.h ++++ b/vmhgfs-fuse/fsutil.h +@@ -32,9 +32,7 @@ + #include "hgfsProto.h" + #include + +-#if defined(__FreeBSD__) || defined(__SOLARIS__) || defined(__APPLE__) + typedef long long loff_t; +-#endif + + /* + * Struct used to pass around attributes.