mykola/opnsense-ports
1
0
Fork 0
forked from Lainports/opnsense-ports
Code Pull requests Activity

emulators/open-vm-tools: sync with upstream

Browse source 
Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2025-01-07 13:50:34 +01:00
parent 501ad8a704
commit 46fd1001c9
6 changed files with 9 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
emulators/open-vm-tools/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= open-vm-tools
PORTVERSION= 12.5.0
PORTREVISION= 1
DISTVERSIONPREFIX= stable-
PORTEPOCH= 2
CATEGORIES= emulators
@ -14,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
ONLY_FOR_ARCHS= aarch64 amd64 i386
LIB_DEPENDS= libdnet.so:net/libdnet
RUN_DEPENDS= open-vm-kmod>0:emulators/open-vm-kmod
FLAVORS= default nox11
default_CONFLICTS_INSTALL= open-vm-tools-nox11
@ -21,7 +23,7 @@ nox11_PKGNAMESUFFIX= -nox11
nox11_CONFLICTS_INSTALL= open-vm-tools
nox11_COMMENT= (without X11)
USES= autoreconf gettext-runtime gnome kmod libtool localbase \
USES= autoreconf gettext-runtime gnome libtool localbase \
pathfix pkgconfig
USE_GITHUB= yes
@ -34,13 +36,12 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--disable-vgauth \
--enable-containerinfo=no \
--sysconfdir=${PREFIX}/etc \
--without-icu
CONFIGURE_ENV+= SYSDIR=${SRC_BASE}/sys
--without-icu \
--without-kernel-modules
INSTALL_TARGET= install-strip
CPPFLAGS+= -Wno-deprecated-declarations
SSP_UNSAFE= kernel module does not support ssp
WRKSRC_SUBDIR= open-vm-tools
@ -75,16 +76,9 @@ post-patch:
@${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@"\
${WRKSRC}/lib/guestApp/guestApp.c
post-build:
cd ${WRKSRC}/modules && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers
${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/input
${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko \
${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko
${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko \
${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/tools.conf \
${STAGEDIR}${DATADIR}/tools.conf.sample

19
emulators/open-vm-tools/files/patch-modules_Makefile.am
View file

@ -1,19 +0,0 @@
--- modules/Makefile.am.orig 2018-09-29 03:57:04 UTC
+++ modules/Makefile.am
@@ -65,11 +65,11 @@ if SOLARIS
done
endif
if FREEBSD
- for MOD in $(MODULES); do \
- $(INSTALL) -d $(DESTDIR)$(MODULES_DIR); \
- $(INSTALL) -m 644 $(modulesrc)/$(MODULES_OS)/$$MOD.ko \
- $(DESTDIR)$(MODULES_DIR); \
- done
+# for MOD in $(MODULES); do \
+# $(INSTALL) -d $(DESTDIR)$(MODULES_DIR); \
+# $(INSTALL) -m 644 $(modulesrc)/$(MODULES_OS)/$$MOD.ko \
+# $(DESTDIR)$(MODULES_DIR); \
+# done
endif
uninstall-hook:

10
emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c
View file

@ -1,10 +0,0 @@
--- modules/freebsd/vmblock/vfsops.c.orig 2023-03-10 17:41:18 UTC
+++ modules/freebsd/vmblock/vfsops.c
@@ -173,7 +173,6 @@ VMBlockVFSMount(struct mount *mp) // IN: mount(
#endif
error = namei(ndp);
if (error) {
- NDFREE(ndp, 0);
uma_zfree(VMBlockPathnameZone, pathname);
return error;
}

24
emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c
View file

@ -1,24 +0,0 @@
--- modules/freebsd/vmmemctl/os.c.orig 2023-03-07 22:57:07 UTC
+++ modules/freebsd/vmmemctl/os.c
@@ -103,7 +103,11 @@ MALLOC_DEFINE(M_VMMEMCTL, BALLOON_NAME, "vmmemctl meta
#define KVA_FREE(offset, size) kva_free(offset, size)
#define KMEM_ALLOC(size) kmem_malloc(size, M_WAITOK | M_ZERO)
-#define KMEM_FREE(offset, size) kmem_free(offset, size)
+#if __FreeBSD_version < 1400070
+ #define KMEM_FREE(offset, size) kmem_free((vm_offset_t)offset, size)
+#else
+ #define KMEM_FREE(offset, size) kmem_free(offset, size)
+#endif
/*
* Globals
@@ -404,7 +408,7 @@ os_pmap_free(os_pmap *p) // IN
static void
os_pmap_free(os_pmap *p) // IN
{
- KMEM_FREE((vm_offset_t)p->bitmap, p->size);
+ KMEM_FREE(p->bitmap, p->size);
p->size = 0;
p->bitmap = NULL;
}

6
emulators/open-vm-tools/files/vmware-kmod.in
View file

@ -13,9 +13,9 @@ checkvm_cmd="%%PREFIX%%/bin/vmware-checkvm > /dev/null"
vmware_mod_load()
{
echo -n "Loading $1 kernel module: "
if kldstat -qn %%PREFIX%%/lib/vmware-tools/modules/drivers/$1.ko; then
if kldstat -qn $1.ko; then
echo "already loaded."
elif kldload -q %%PREFIX%%/lib/vmware-tools/modules/drivers/$1.ko; then
elif kldload -q $1.ko; then
echo "done."
else
echo "failed."
@ -25,7 +25,7 @@ vmware_mod_load()
vmware_mod_status()
{
echo -n "Checking $1 kernel module: "
if kldstat -qn %%PREFIX%%/lib/vmware-tools/modules/drivers/$1.ko; then
if kldstat -qn $1.ko; then
echo "loaded."
else
echo "not loaded"

3
emulators/open-vm-tools/pkg-plist
View file

@ -53,8 +53,6 @@ lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
%%X11%%lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
%%X11%%lib/open-vm-tools/plugins/vmusr/libdndcp.so
%%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
lib/vmware-tools/modules/drivers/vmblock.ko
lib/vmware-tools/modules/drivers/vmmemctl.ko
%%DEPLOYPKG%%libdata/pkgconfig/libDeployPkg.pc
libdata/pkgconfig/vmguestlib.pc
sbin/mount_vmblock
@ -83,6 +81,7 @@ share/vmware-tools/resume-vm-default
share/vmware-tools/scripts/vmware/network
share/vmware-tools/statechange.subr
share/vmware-tools/suspend-vm-default
@dir lib/vmware-tools/modules/drivers
@dir lib/vmware-tools/modules/input
@dir %%DATADIR%%/scripts/vmware
@dir %%DATADIR%%/tests