From acc8387bfbbdd7777a2193a64c0ca5e84a2e2dac Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 5 Oct 2021 16:43:59 +0000 Subject: [PATCH 1/3] app-emulation: Upgrade open-vm-tools 11.3.0 to 11.3.5 --- .../coreos-overlay/app-emulation/open-vm-tools/Manifest | 2 +- ...{open-vm-tools-11.3.0.ebuild => open-vm-tools-11.3.5.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/{open-vm-tools-11.3.0.ebuild => open-vm-tools-11.3.5.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/Manifest index 8ec5b5738e..864efd4706 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/Manifest @@ -1 +1 @@ -DIST open-vm-tools-11.3.0-18090558.tar.gz 4243260 BLAKE2B f3404e922f251e6d9699c85906a9da80d6ebfa67f347bb98224faba9985b70a1568ee3907e59d984c1c443281bc506178d2aaeed5e5d0ca952a683907e24aa86 SHA512 36fa4fc309e57f49f1000abe8ca48aaf8bda67cd0ef3fd25ed0dfc12e2dd88e5a2bc8dae69abbadb44b2fa5195802f9925681a452f54916daa268adb20e8c8cd +DIST open-vm-tools-11.3.5-18557794.tar.gz 4218935 BLAKE2B 41e3f5877a5074bfb206870d7bdba613a468aa104d6d497dcf16e80b24fcbdd2195fcce370b150ced4665dd19296ff27dc06922d2742a43f5bf70b1b5eea9d48 SHA512 fa31f5615c9c90865ba9122f7fcd0831068d48defee30a5f5c620e744b76ccd5b7cc2de20cea4e37b596f99619ffb7bb47774de04e7c4bea666c7c0b6fa1560e diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-11.3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-11.3.5.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-11.3.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-11.3.5.ebuild index 991ae0ef3d..be7387067c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-11.3.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-11.3.5.ebuild @@ -7,7 +7,7 @@ inherit autotools flag-o-matic multilib toolchain-funcs DESCRIPTION="Opensourced tools for VMware guests" HOMEPAGE="https://github.com/vmware/open-vm-tools" -MY_P="${P}-18090558" +MY_P="${P}-18557794" SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz" LICENSE="LGPL-2.1" From 88f4aa75e01e34b3a79bd1bb1cb0ed38475c0fcc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 5 Oct 2021 16:43:59 +0000 Subject: [PATCH 2/3] coreos-base: Upgrade oem-vmware 11.3.0 to 11.3.5 --- .../{oem-vmware-11.3.0.ebuild => oem-vmware-11.3.5.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/{oem-vmware-11.3.0.ebuild => oem-vmware-11.3.5.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-11.3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-11.3.5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-11.3.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-11.3.5.ebuild From 52e44b5c5447ae3a931f12a6ddfcd5cf261e762c Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 8 Oct 2021 12:44:07 +0000 Subject: [PATCH 3/3] app-emulation/open-vm-tools: refresh patch after upgrade to 11.3.5 Hgfs-mounter has been dropped from the repository and it let's make the patch name independent of the package version so that the patch doesn't have to be touched on every upgrade. Signed-off-by: Jeremi Piotrowski --- ...-Add-options-for-fuse-hgfs-and-udev.patch} | 31 +++++-------------- .../open-vm-tools/open-vm-tools-11.3.5.ebuild | 3 +- 2 files changed, 9 insertions(+), 25 deletions(-) rename 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 => open-vm-tools-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch} (55%) 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