From: Piraty <Piraty@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] open-vm-tools: update to 12.0.0.
Date: Tue, 10 May 2022 10:26:48 +0200 [thread overview]
Message-ID: <20220510082648.QKJYOlvHl4Is-MzeYnrw8oDHR3txfqPe8syupgmO5Ks@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37067@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages open-vm-tools-12.0.0
https://github.com/void-linux/void-packages/pull/37067
open-vm-tools: update to 12.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
I don't run vmware guests anymore, so testers are welcome
A patch file from https://github.com/void-linux/void-packages/pull/37067.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-open-vm-tools-12.0.0-37067.patch --]
[-- Type: text/x-diff, Size: 5968 bytes --]
From cf04ef8f4d963fe6e293defc39aea4dc4ac3ac92 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 10 May 2022 00:10:27 +0200
Subject: [PATCH] open-vm-tools: update to 12.0.0.
disable new containerinfo plugin, as it fails during configure when
crosscompiling (AC_CHECK_FILE) and requires work on containerd template.
may become a build option later
---
.../patches/0001-recognize-Void.patch | 18 ++++++-------
...2-Fix-subdir-objects-configure-error.patch | 27 -------------------
srcpkgs/open-vm-tools/template | 20 +++++++-------
3 files changed, 18 insertions(+), 47 deletions(-)
delete mode 100644 srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch
diff --git a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
index 87a145a2becc..ad6d37b130ac 100644
--- a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
+++ b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
@@ -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 },
diff --git a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch b/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch
deleted file mode 100644
index 775a78d303e2..000000000000
--- a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch
+++ /dev/null
@@ -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
-
- ###
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 27fcfbbb0b6f..07c5bebdeb4a 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -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,16 @@ 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
}
next prev parent reply other threads:[~2022-05-10 8:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 22:24 [PR PATCH] " Piraty
2022-05-09 23:08 ` [PR PATCH] [Updated] " Piraty
2022-05-10 8:26 ` Piraty
2022-05-10 8:26 ` Piraty [this message]
2022-05-10 19:23 ` tranzystorek-io
2022-05-11 22:39 ` Piraty
2022-05-12 7:03 ` tranzystorek-io
2022-05-12 9:09 ` tranzystorek-io
2022-05-12 9:14 ` tranzystorek-io
2022-05-12 12:45 ` tranzystorek-io
2022-05-13 7:40 ` tranzystorek-io
2022-05-14 16:28 ` tranzystorek-io
2022-05-16 19:21 ` Piraty
2022-05-16 19:24 ` tranzystorek-io
2022-05-16 22:37 ` [PR PATCH] [Updated] " Piraty
2022-05-17 7:56 ` tranzystorek-io
2022-05-17 7:58 ` tranzystorek-io
2022-05-17 18:11 ` [PR PATCH] [Closed]: " Piraty
2022-05-17 18:28 ` Piraty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220510082648.QKJYOlvHl4Is-MzeYnrw8oDHR3txfqPe8syupgmO5Ks@z \
--to=piraty@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).