open-vm-tools: update to 12.0.0.

disable new containerinfo plugin for now, as it fails during configure
when crosscompiling (AC_CHECK_FILE) and requires work on containerd
template anyway. it may become a build option later

add vmware-vmblock-fuse service as reported by @tranzystorek-io.

Closes: #37067
This commit is contained in:
Piraty 2022-05-10 00:10:27 +02:00
parent 290d86ca28
commit d8339127dc
No known key found for this signature in database
GPG Key ID: 82F2CC796BD07077
4 changed files with 25 additions and 47 deletions

View File

@ -0,0 +1,6 @@
#!/bin/sh
set -e
[ -d /run/vmblock-fuse ] || mkdir -p /run/vmblock-fuse
exec vmware-vmblock-fuse -d -f -o subtype=vmware-vmblock,default_permissions,allow_other /run/vmblock-fuse

View File

@ -11,15 +11,13 @@
#define STR_OS_YELLOW_DOG "Yellow Dog"
#define STR_OS_ECOMSTATION "eComStation"
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 6ac15412..ea898e24 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -1259,6 +1259,7 @@ static const ShortNameSet shortNameArray[] = {
{"united linux", STR_OS_UNITEDLINUX, HostinfoGenericSetShortName},
{"va linux", STR_OS_VALINUX, HostinfoGenericSetShortName},
{"vmware photon", STR_OS_PHOTON, HostinfoGenericSetShortName},
+{"void", STR_OS_VOID, HostinfoGenericSetShortName},
{"yellow dog", STR_OS_YELLOW_DOG, HostinfoGenericSetShortName},
{NULL, NULL, NULL} // MUST BE LAST
};
@@ -1288,6 +1288,7 @@
{ "ubuntu", STR_OS_UBUNTU, HostinfoGenericSetShortName },
{ "ultra penguin", STR_OS_ULTRAPENGUIN, HostinfoGenericSetShortName },
{ "united linux", STR_OS_UNITEDLINUX, HostinfoGenericSetShortName },
+{ "void linux", STR_OS_VOID, HostinfoGenericSetShortName },
{ "va linux", STR_OS_VALINUX, HostinfoGenericSetShortName },
{ "vmware photon", STR_OS_PHOTON, HostinfoGenericSetShortName },
{ "yellow dog", STR_OS_YELLOW_DOG, HostinfoGenericSetShortName },

View File

@ -1,27 +0,0 @@
#src: http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/open-vm-tools/open-vm-tools?id=6642ae94227f7c3c91c1a58f00f99aeb9eb2393f
#upstream: no
From cf1284fda8fb22a2b27cb2ce7962f166166e74c3 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 13 Jun 2018 23:48:04 -0700
Subject: [PATCH] Fix subdir objects configure error
Fix build on musl while here
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
open-vm-tools/configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 71e684bb..b76a7966 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -303,6 +303,7 @@ AC_ARG_ENABLE(
[],
[enable_resolutionkms="auto"])
+AM_INIT_AUTOMAKE([subdir-objects])
AM_INIT_AUTOMAKE
###

View File

@ -1,25 +1,25 @@
# Template file for 'open-vm-tools'
pkgname=open-vm-tools
version=11.3.0
version=12.0.0
revision=1
archs="x86_64* i686* aarch64*"
wrksrc="open-vm-tools-stable-${version}"
build_wrksrc="open-vm-tools"
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
--without-xmlsecurity --without-kernel-modules
--without-xmlsecurity --without-kernel-modules --disable-containerinfo
$(vopt_with x11 x) $(vopt_with pam)"
hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
$(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
$(vopt_if x11 'gdk-pixbuf-xlib-devel gtkmm-devel libXtst-devel xmlsec1-devel')"
short_desc="Open source implementation of VMware Tools"
maintainer="Piraty <piraty1@inbox.ru>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/vmware/open-vm-tools"
changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog"
distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz"
checksum=588f1b6252c36bc55581aa3451a47880290f38ef46aad493710bcf4ce3c7635e
checksum=244d224dc503f2c9350899a61fef418f23dc0520e8e30dce10863ea2dc81f047
build_options="pam x11"
build_options_default="pam x11"
@ -33,16 +33,17 @@ pre_configure() {
}
post_install() {
# Get rid of unwanted symlinks
rm ${DESTDIR}/sbin/mount.vmhgfs
rm -r ${DESTDIR}/sbin
# If X11 enabled, copy extra files
if [ "$build_option_x11" ]; then
vmkdir /etc/xdg/autostart
vinstall vmware-user-suid-wrapper/vmware-user.desktop 0644 /etc/xdg/autostart/
vbin scripts/common/vmware-xdg-detect-de
chmod 07755 ${DESTDIR}/usr/bin/vmware-user-suid-wrapper
chmod 4755 "${DESTDIR}/usr/bin/vmware-user-suid-wrapper"
fi
# Install service
if [ ! "$build_option_pam" ]; then
rm -rf "${DESTDIR}/etc/pam.d/vmtoolsd"
fi
vsv vmtoolsd
vsv vmware-vmblock-fuse
}