open-vm-tools/detect-suse-location.patch
Kirk Allan e01dba6e31 Accepting request 1042521 from home:ccrane:branches:Virtualization:VMware
- Add containerInfo plugin (jsc-PED-1344)
    - Add dependencies on grpc, protobuf, and containerd for container introspection

- Add _service to handle open-vm-tools sources
- Update to 12.1.5 (build 20735119)
  - A number of Coverity reported issues have been addressed.
  - The deployPkg plugin may prematurely reboot the guest VM before cloud-init 
    has completed user data setup. If both the Perl based Linux customization 
    script and cloud-init run when the guest VM boots, the deployPkg plugin 
    may reboot the guest before cloud-init has finished. The deployPkg 
    plugin has been updated to wait for a running cloud-init process to 
    finish before the guest VM reboot is initiated. This issue is fixed in 
    this release.
  - A SIGSEGV may be encountered when a non-quiesing snapshot times out. 
    This issue is fixed in this release.
  - Unwanted vmtoolsd service error message if not on a VMware hypervisor.
    When open-vm-tools comes preinstalled in a base Linux release, the vmtoolsd
    services are started automatically at system start and desktop login. 
    If running on physical hardware or in a non-VMware hypervisor, the services
    will emit an error message to the Systemd's logging service before stopping.
    This issue is fixed in this release.

OBS-URL: https://build.opensuse.org/request/show/1042521
OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=421
2022-12-13 18:54:37 +00:00

27 lines
1.2 KiB
Diff

diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 3c058135..203fdc6f 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -726,12 +726,18 @@ AC_DEFUN([AC_VMW_CONTAINERINFO_MSG],[
#
# proto files needed by containerd grpc client.
#
- shared_prefix=/usr/share/gocode/src/github.com
+ for d in /usr/share/gocode/src /usr/share/go/1.*/contrib/src; do
+ if test -d "$d"/github.com; then
+ src_prefix="$d"
+ break
+ fi
+ done
+ shared_prefix=$src_prefix/github.com
AC_SUBST(TYPES_DIR, github.com/containerd/containerd/api/types)
AC_SUBST(TASKS_PROTOPATH, $shared_prefix/containerd/containerd/api/services/tasks/v1)
- AC_SUBST(DEP_PROTOPATH, /usr/share/gocode/src)
+ AC_SUBST(DEP_PROTOPATH, $src_prefix)
AC_SUBST(CONTAINERD_PROTOPATH, $shared_prefix/containerd/containerd/api/services/containers/v1)
- AC_SUBST(GOGO_PROTOPATH, $shared_prefix/gogo/protobuf)
+ AC_SUBST(GOGO_PROTOPATH, $shared_prefix/containerd/containerd/vendor/github.com/gogo/protobuf)
AC_CHECK_FILE([${CONTAINERD_PROTOPATH}/containers.proto],
[],
[AC_VMW_CONTAINERINFO_MSG(["containerd package"])])