Skip to content

Commit

Permalink
open-vm-tools SUSE: Detect the proto files for the containerd grpc cl…
Browse files Browse the repository at this point in the history
…ient

On SUSE systems, the Go src'es are installed in a different location,
namely /usr/share/go/1.18/contrib/src.
Extend the config checks to detect that location.

OVT pull request: #626
  • Loading branch information
johnwvmw committed Jan 1, 2023
1 parent f749bd5 commit 301cea5
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
3 changes: 3 additions & 0 deletions open-vm-tools/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,6 @@ Bartosz Brachaczek Make HgfsConvertFromNtTimeNsec aware of 64-bit time_t on i386

Bernd Zeimetz Fix building containerinfo plugin on i386
- https://github.com/vmware/open-vm-tools/pull/588

Dirk Mueller Detect the proto files for containerd grpc client on SUSE like systems
- https://github.com/vmware/open-vm-tools/pull/626
14 changes: 12 additions & 2 deletions open-vm-tools/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -726,10 +726,20 @@ AC_DEFUN([AC_VMW_CONTAINERINFO_MSG],[
#
# proto files needed by containerd grpc client.
#
shared_prefix=/usr/share/gocode/src/github.com
# Installation location varies between Linux vendors.
# Canonical, Ubuntu and Debian: in /usr/share/gocode/src
# openSUSE/SUSE: in /usr/share/go/<version>/contrib/src
#
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_CHECK_FILE([${CONTAINERD_PROTOPATH}/containers.proto],
Expand Down

0 comments on commit 301cea5

Please sign in to comment.