open-vm-tools: Update to 11.2.0 and move tools.conf
Update app-emulation/open-vm-tools package.
Move tools.conf into package it affects, which is
app-emulation/open-vm-tools in project-lakitu. Previously was in chiron
chromeos-bsp-chiron-private.
BUG=b/180150638
TEST=presubmit
RELEASE_NOTE=None
Change-Id: Id35b804ca6426969f368d18bc8180f788ff8b337
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/12210
Reviewed-by: Roy Yang <royyang@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/project-lakitu/app-emulation/open-vm-tools/Manifest b/project-lakitu/app-emulation/open-vm-tools/Manifest
index 9b0cc0e..9b7153c 100644
--- a/project-lakitu/app-emulation/open-vm-tools/Manifest
+++ b/project-lakitu/app-emulation/open-vm-tools/Manifest
@@ -1 +1 @@
-DIST open-vm-tools-11.1.0-16036546.tar.gz 3986835 BLAKE2B f02e9426fb324ec0f4f78f43554a55ce0b615f609f888c008e8ecaf59332b9e25b0c865730cd263be1936d223c9cd5e078d304d1ddd8903cec88512cd63c258b SHA512 cd1f8399b9660ecac8222cfdc0d6331dce67db2f3a1788f21b18b201066dbcd059f429130f1fb5b416bb9a06b4882ec462a134aa8ca595f17dc48af0b7f59e8e
+DIST open-vm-tools-11.2.0-16938113.tar.gz 4050857 BLAKE2B b0e5e1e985d9f3d50dbbb8a4a7939d37d8968f0aa15e6d7200b7ec8511bd059d3a78a4ddd763d22965dc6da614d156e6b7ee23af73490f8bbf8e1dc2664041d3 SHA512 c950d6e8ba5218dd40e845f3c2b09eeb640ef0d33c7ea1671164027927e062dcf0b4745f6e4515a7495ec20a6d06a8fbf700819f6211073194b5ef97d7be441d
diff --git a/project-lakitu/app-emulation/open-vm-tools/files/tools.conf b/project-lakitu/app-emulation/open-vm-tools/files/tools.conf
new file mode 100644
index 0000000..ae38feb
--- /dev/null
+++ b/project-lakitu/app-emulation/open-vm-tools/files/tools.conf
@@ -0,0 +1,17 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+[guestinfo]
+primary-nics=ens*
+exclude-nics=cali*,docker*,veth*
diff --git a/project-lakitu/app-emulation/open-vm-tools/open-vm-tools-11.1.0-r1.ebuild b/project-lakitu/app-emulation/open-vm-tools/open-vm-tools-11.1.0-r1.ebuild
deleted file mode 120000
index 5deb52b..0000000
--- a/project-lakitu/app-emulation/open-vm-tools/open-vm-tools-11.1.0-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-open-vm-tools-11.1.0.ebuild
\ No newline at end of file
diff --git a/project-lakitu/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113-r1.ebuild b/project-lakitu/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113-r1.ebuild
new file mode 120000
index 0000000..d63e280
--- /dev/null
+++ b/project-lakitu/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113-r1.ebuild
@@ -0,0 +1 @@
+open-vm-tools-11.2.0_p16938113.ebuild
\ No newline at end of file
diff --git a/project-lakitu/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild b/project-lakitu/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113.ebuild
similarity index 92%
rename from project-lakitu/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild
rename to project-lakitu/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113.ebuild
index f395265..fc18a86 100644
--- a/project-lakitu/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild
+++ b/project-lakitu/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113.ebuild
@@ -1,14 +1,14 @@
-# Copyright 2007-2020 Gentoo Authors
+# Copyright 2007-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools linux-info pam systemd toolchain-funcs
+inherit autotools linux-info pam systemd
DESCRIPTION="Opensourced tools for VMware guests"
HOMEPAGE="https://github.com/vmware/open-vm-tools"
-MY_P="${P}-16036546"
-SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz"
+MY_P="${PN}-${PV/_p/-}"
+SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV%_p*}/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
@@ -39,7 +39,7 @@
x11-libs/libXtst
x11-libs/libSM
x11-libs/libXcomposite
- x11-libs/gdk-pixbuf:2
+ x11-libs/gdk-pixbuf-xlib
x11-libs/gtk+:3
gtkmm? (
dev-cpp/gtkmm:3.0
@@ -123,6 +123,10 @@
# Enable the vmtoolsd service by default.
systemd_enable_service multi-user.target vmtoolsd.service
+
+ # Insert config file.
+ insinto /etc/vmware-tools
+ doins "${FILESDIR}"/tools.conf
}
src_install() {
