From d41be7e2d80c3164594952e0b03504b52b006221 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 20 Dec 2019 13:22:02 -0500 Subject: app-emulation/open-vm-tools: fix udev warnings Package-Manager: Portage-2.3.82, Repoman-2.3.20_p9 Signed-off-by: Mike Gilbert --- .../files/11.0.1-udev-complaints.patch | 60 +++++++++ .../open-vm-tools/open-vm-tools-11.0.1-r1.ebuild | 142 +++++++++++++++++++++ .../open-vm-tools/open-vm-tools-11.0.1.ebuild | 141 -------------------- 3 files changed, 202 insertions(+), 141 deletions(-) create mode 100644 app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch create mode 100644 app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild delete mode 100644 app-emulation/open-vm-tools/open-vm-tools-11.0.1.ebuild (limited to 'app-emulation/open-vm-tools') diff --git a/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch b/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch new file mode 100644 index 000000000000..b34e06d1a227 --- /dev/null +++ b/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch @@ -0,0 +1,60 @@ +From f1dab8ded45aaaa4b6993a4d96d0aefc700f1796 Mon Sep 17 00:00:00 2001 +From: Oliver Kurth +Date: Mon, 28 Oct 2019 16:12:42 -0700 +Subject: [PATCH] stop systemd-243 udev complaints #371 + +Address issues from pull request #371 on github: +- fix substiution variables for systemd-243 +- fix permissions of rules file +See https://github.com/vmware/open-vm-tools/pull/371 +--- + open-vm-tools/AUTHORS | 4 ++++ + open-vm-tools/udev/99-vmware-scsi-udev.rules | 6 +++--- + open-vm-tools/udev/Makefile.am | 4 ++-- + 3 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS +index 08cc28ef2..026de07e6 100644 +--- a/open-vm-tools/AUTHORS ++++ b/open-vm-tools/AUTHORS +@@ -49,3 +49,7 @@ Josh Paetzel Additional changes to vmmemctl.ko for FreeBSD 12.0 API changes. + + Haruki Tsurumoto Fix Asianux identification + - https://github.com/vmware/open-vm-tools/pull/325 ++ ++MilhouseVH stop systemd-243 udev complaints ++ - https://github.com/vmware/open-vm-tools/pull/371 ++ +diff --git a/open-vm-tools/udev/99-vmware-scsi-udev.rules b/open-vm-tools/udev/99-vmware-scsi-udev.rules +index 053b59706..fb4ed6844 100644 +--- a/open-vm-tools/udev/99-vmware-scsi-udev.rules ++++ b/open-vm-tools/udev/99-vmware-scsi-udev.rules +@@ -1,7 +1,7 @@ +-# Copyright (C) 2016 VMware, Inc. All rights reserved. ++# Copyright (C) 2016,2019 VMware, Inc. All rights reserved. + # + # This file is part of open-vm-tools + +-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'" +-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'" ++ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$env{DEVPATH}/device/timeout'" ++ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$env{DEVPATH}/device/timeout'" + +diff --git a/open-vm-tools/udev/Makefile.am b/open-vm-tools/udev/Makefile.am +index 68fbc3e27..c3baadf16 100644 +--- a/open-vm-tools/udev/Makefile.am ++++ b/open-vm-tools/udev/Makefile.am +@@ -1,5 +1,5 @@ + ################################################################################ +-### Copyright (C) 2016 VMware, Inc. All rights reserved. ++### Copyright (C) 2016,2019 VMware, Inc. All rights reserved. + ### + ### This program is free software; you can redistribute it and/or modify + ### it under the terms of version 2 of the GNU General Public License as +@@ -17,5 +17,5 @@ + + install-data-local: + $(INSTALL) -d $(DESTDIR)$(UDEVRULESDIR) +- $(INSTALL) $(srcdir)/99-vmware-scsi-udev.rules $(DESTDIR)$(UDEVRULESDIR) ++ $(INSTALL) -m 644 $(srcdir)/99-vmware-scsi-udev.rules $(DESTDIR)$(UDEVRULESDIR) + diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild new file mode 100644 index 000000000000..3fb3beb6d1d3 --- /dev/null +++ b/app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild @@ -0,0 +1,142 @@ +# Copyright 2007-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info pam systemd toolchain-funcs + +DESCRIPTION="Opensourced tools for VMware guests" +HOMEPAGE="https://github.com/vmware/open-vm-tools" +MY_P="${P}-14773994" +SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl static-libs +vgauth" +REQUIRED_USE=" + multimon? ( X ) + vgauth? ( ssl ) +" + +RDEPEND=" + dev-libs/glib + net-libs/libtirpc + deploypkg? ( dev-libs/libmspack ) + fuse? ( sys-fs/fuse:0 ) + pam? ( sys-libs/pam ) + ssl? ( dev-libs/openssl:0 ) + vgauth? ( + dev-libs/libxml2 + dev-libs/xmlsec + ) + X? ( + x11-libs/libXext + multimon? ( x11-libs/libXinerama ) + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXrandr + x11-libs/libXtst + x11-libs/libSM + x11-libs/libXcomposite + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + gtkmm? ( + dev-cpp/gtkmm:3.0 + dev-libs/libsigc++:2 + ) + ) + dnet? ( dev-libs/libdnet ) + icu? ( dev-libs/icu:= ) + resolutionkms? ( + x11-libs/libdrm[video_cards_vmware] + virtual/libudev + ) +" + +DEPEND="${RDEPEND} + net-libs/rpcsvc-proto +" + +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/10.1.0-mount.vmhgfs.patch" + "${FILESDIR}/10.1.0-Werror.patch" + "${FILESDIR}/11.0.1-udev-complaints.patch" +) + +pkg_setup() { + local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3" + use X && CONFIG_CHECK+=" ~DRM_VMWGFX" + kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS" + kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS" + linux-info_pkg_setup +} + +src_prepare() { + eapply -p2 "${PATCHES[@]}" + eapply_user + eautoreconf +} + +src_configure() { + local myeconfargs=( + --without-root-privileges + $(use_enable multimon) + $(use_with X x) + $(use_with X gtk3) + $(use_with gtkmm gtkmm3) + $(use_enable doc docs) + --disable-tests + $(use_enable resolutionkms) + $(use_enable static-libs static) + $(use_enable deploypkg) + $(use_with pam) + $(use_enable vgauth) + $(use_with dnet) + $(use_with icu) + ) + # Avoid a bug in configure.ac + use ssl || myeconfargs+=( --without-ssl ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + + if use pam; then + rm "${ED}"/etc/pam.d/vmtoolsd || die + pamd_mimic_system vmtoolsd auth account + fi + + newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools + newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools + + if use vgauth; then + systemd_newunit "${FILESDIR}"/vmtoolsd.vgauth.service vmtoolsd.service + systemd_dounit "${FILESDIR}"/vgauthd.service + else + systemd_dounit "${FILESDIR}"/vmtoolsd.service + fi + + # Replace mount.vmhgfs with a wrapper + mv "${ED}"/usr/sbin/{mount.vmhgfs,hgfsmounter} || die + dosbin "${FILESDIR}/mount.vmhgfs" + + # Make fstype = vmhgfs-fuse work in fstab + dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse + + if use X; then + fperms 4711 /usr/bin/vmware-user-suid-wrapper + dobin scripts/common/vmware-xdg-detect-de + fi +} diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.0.1.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.0.1.ebuild deleted file mode 100644 index d86104a2c508..000000000000 --- a/app-emulation/open-vm-tools/open-vm-tools-11.0.1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 2007-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-info pam systemd toolchain-funcs - -DESCRIPTION="Opensourced tools for VMware guests" -HOMEPAGE="https://github.com/vmware/open-vm-tools" -MY_P="${P}-14773994" -SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl static-libs +vgauth" -REQUIRED_USE=" - multimon? ( X ) - vgauth? ( ssl ) -" - -RDEPEND=" - dev-libs/glib - net-libs/libtirpc - deploypkg? ( dev-libs/libmspack ) - fuse? ( sys-fs/fuse:0 ) - pam? ( sys-libs/pam ) - ssl? ( dev-libs/openssl:0 ) - vgauth? ( - dev-libs/libxml2 - dev-libs/xmlsec - ) - X? ( - x11-libs/libXext - multimon? ( x11-libs/libXinerama ) - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXrandr - x11-libs/libXtst - x11-libs/libSM - x11-libs/libXcomposite - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - gtkmm? ( - dev-cpp/gtkmm:3.0 - dev-libs/libsigc++:2 - ) - ) - dnet? ( dev-libs/libdnet ) - icu? ( dev-libs/icu:= ) - resolutionkms? ( - x11-libs/libdrm[video_cards_vmware] - virtual/libudev - ) -" - -DEPEND="${RDEPEND} - net-libs/rpcsvc-proto -" - -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/10.1.0-mount.vmhgfs.patch" - "${FILESDIR}/10.1.0-Werror.patch" -) - -pkg_setup() { - local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3" - use X && CONFIG_CHECK+=" ~DRM_VMWGFX" - kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS" - kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS" - linux-info_pkg_setup -} - -src_prepare() { - eapply -p2 "${PATCHES[@]}" - eapply_user - eautoreconf -} - -src_configure() { - local myeconfargs=( - --without-root-privileges - $(use_enable multimon) - $(use_with X x) - $(use_with X gtk3) - $(use_with gtkmm gtkmm3) - $(use_enable doc docs) - --disable-tests - $(use_enable resolutionkms) - $(use_enable static-libs static) - $(use_enable deploypkg) - $(use_with pam) - $(use_enable vgauth) - $(use_with dnet) - $(use_with icu) - ) - # Avoid a bug in configure.ac - use ssl || myeconfargs+=( --without-ssl ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - - if use pam; then - rm "${ED}"/etc/pam.d/vmtoolsd || die - pamd_mimic_system vmtoolsd auth account - fi - - newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools - newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools - - if use vgauth; then - systemd_newunit "${FILESDIR}"/vmtoolsd.vgauth.service vmtoolsd.service - systemd_dounit "${FILESDIR}"/vgauthd.service - else - systemd_dounit "${FILESDIR}"/vmtoolsd.service - fi - - # Replace mount.vmhgfs with a wrapper - mv "${ED}"/usr/sbin/{mount.vmhgfs,hgfsmounter} || die - dosbin "${FILESDIR}/mount.vmhgfs" - - # Make fstype = vmhgfs-fuse work in fstab - dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse - - if use X; then - fperms 4711 /usr/bin/vmware-user-suid-wrapper - dobin scripts/common/vmware-xdg-detect-de - fi -} -- cgit v1.2.3-65-gdbad