From 0336d576275e224758a42cbd753fcb03d02776d4 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 13 Sep 2023 16:10:46 +0200 Subject: [PATCH] overlay app-emulation/open-vm-tools: Apply Flatcar modifications None of these modifications are actually specific to Flatcar. This is something we will want to upstream to Gentoo. --- ....ebuild => open-vm-tools-12.3.0-r1.ebuild} | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/{open-vm-tools-12.3.0.ebuild => open-vm-tools-12.3.0-r1.ebuild} (74%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-12.3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-12.3.0-r1.ebuild similarity index 74% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-12.3.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-12.3.0-r1.ebuild index 28075b81f6..e582b2cce3 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-12.3.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-12.3.0-r1.ebuild @@ -13,17 +13,22 @@ SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 x86" -IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth" +# Flatcar: TO UPSTREAM: added fuse3 USE flag +IUSE="X +deploypkg +dnet doc +fuse fuse3 gtkmm +icu multimon pam +resolutionkms +ssl +vgauth" +# Flatcar: TO UPSTREAM: made fuse and fuse3 exclusive REQUIRED_USE=" multimon? ( X ) vgauth? ( ssl ) + ?? ( fuse fuse3 ) " +# Flatcar: TO UPSTREAM: added optional dep on sys-fs/fuse:3 RDEPEND=" dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) + fuse3? ( sys-fs/fuse:3 ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( dev-libs/openssl:0= ) @@ -105,6 +110,19 @@ src_configure() { $(use_with dnet) $(use_with icu) --with-udev-rules-dir="$(get_udevdir)/rules.d" + # Flatcar: TO UPSTREAM: explicitly specify fuse version + $(use_with fuse fuse 2) + $(use_with fuse3 fuse 3) + # Flatcar: TO UPSTREAM: Disable it explicitly, we do + # not yet list the containerinfo dependencies in the + # ebuild + --disable-containerinfo + # Flatcar: TO UPSTREAM: Disable it explicitly, gtk2 is + # obsolete + --without-gtk2 + # Flatcar: TO UPSTREAM: Possibly add a separate USE + # flag for the utility, or merge it into resolutionkms + --disable-vmwgfxctrl ) # Avoid a bug in configure.ac use ssl || myeconfargs+=( --without-ssl ) @@ -131,8 +149,11 @@ src_install() { systemd_dounit "${FILESDIR}"/vmtoolsd.service fi - # Make fstype = vmhgfs-fuse work in fstab - dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse + # Flatcar: TO UPSTREAM: vmhgfs-fuse is built only when fuse or fuse3 are enabled + if use fuse || use fuse3; then + # Make fstype = vmhgfs-fuse work in fstab + dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse + fi if use X; then fperms 4711 /usr/bin/vmware-user-suid-wrapper