Merge pull request #4 from perrin-1/master

Fix compilation for DSM-7.0

Author: Grandma-Betty

README.md

@@ -90,7 +90,7 @@ Delete the `.tar.gz`-file:
 
 **6.** Clone the `open-vm-tools` build files:
 
-`git clone https://github.com/NeverEatYellowSwissSnow/synology-dsm-open-vm-tools.git ~/tmp/open-vm-tools`
+`git clone https://github.com/perrin-1/synology-dsm-open-vm-tools.git ~/tmp/open-vm-tools`
 
 **7.** Edit the following file which holds the according checksum files and replace all values with the previously generated checksums from `~/tmp/checksums.txt`:
 
@@ -120,17 +120,23 @@ Save the file and quit the editor.
 
 `make setup`
 
-**12.** Compile:
+**12.** Install missing package `sponge`
 
-`cd /spksrc/spk/open-vm-tools/ && make arch-apollolake-6.2`
+The official synocommunity/spksrc docker container is missing the binary sponge. You need to install that for the build to finish:
+`apt update`
+`apt install moreutils`
+
+**13.** Compile:
+
+`cd /spksrc/spk/open-vm-tools/ && make arch-apollolake-7.0`
 
 Sidenote: Other common architectures could be:
 
-`arch-bromolow-6.2`
+`arch-bromolow-6.2` or `arch-bromolow-7.0`
 
 or
 
-`arch-broadwell-6.2`
+`arch-broadwell-6.2` or `arch-broadwell-7.0`
 
 or
 
@@ -144,6 +150,6 @@ You can now find the compiled `.spk`-package here:
 
 `~/tmp/spksrc/packages`
 
-**13.** Install the compiled `.spk`-package on your `Synology DSM` system.
+**14.** Install the compiled `.spk`-package on your `Synology DSM` system.
 
 Done.

cross/open-vm-tools/Makefile

@@ -1,6 +1,6 @@
 PKG_NAME = open-vm-tools
-PKG_VERS = 11.3.0
-PKG_BUILD = 18090558
+PKG_VERS = 11.3.5
+PKG_BUILD = 18557794
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-$(PKG_BUILD).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/vmware/open-vm-tools/releases/download/stable-$(PKG_VERS)
@@ -45,4 +45,4 @@ vmtools_post_install:
 	chmod a-x $(STAGING_INSTALL_PREFIX)/etc/vmware-tools/*.conf.example
 	# chmod a-x $(STAGING_INSTALL_PREFIX)/etc/vmware-tools/vgauth/schemas/*
 	chmod a-x $(STAGING_INSTALL_PREFIX)/lib/udev/rules.d/99-vmware-scsi-udev.rules
-	mv $(STAGING_INSTALL_PREFIX)/usr/bin/vm-support $(STAGING_INSTALL_PREFIX)/bin/
+	mv $(STAGING_INSTALL_PREFIX)/usr/bin/vm-support $(STAGING_INSTALL_PREFIX)/bin/

cross/open-vm-tools/PLIST

@@ -34,7 +34,6 @@ lib:lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
 lib:lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
 lib:lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
 rsc:lib/udev/rules.d/99-vmware-scsi-udev.rules
-bin:sbin/mount.vmhgfs
 rsc:share/open-vm-tools/messages/de/toolboxcmd.vmsg
 rsc:share/open-vm-tools/messages/de/vmtoolsd.vmsg
 rsc:share/open-vm-tools/messages/ja/toolboxcmd.vmsg

cross/open-vm-tools/digests

@@ -1,3 +1,3 @@
-open-vm-tools-11.3.0-18090558.tar.gz SHA1 3959daf1acc10c565806fe3c8569776d2ea508c3
-open-vm-tools-11.3.0-18090558.tar.gz SHA256 9bad3ee755340853bf7990e92f3d3880959a73e0749e8aaae62730854368bd2c
-open-vm-tools-11.3.0-18090558.tar.gz MD5 1b8a211ce9c757cfea72b40c82bf8d80
+open-vm-tools-11.3.5-18557794.tar.gz SHA1 f6990193579d96a04bfec6f09e93e0164deef71e
+open-vm-tools-11.3.5-18557794.tar.gz SHA256 2053daf7b224ab7ae1a9cfcd6ae12494c646e2bf9aaca998225bd082a4a43fb7
+open-vm-tools-11.3.5-18557794.tar.gz MD5 5ee21a56d5fd7a1838f41e328c061084

cross/procps-ng/Makefile

@@ -0,0 +1,16 @@
+PKG_NAME = procps-ng
+PKG_VERS = 3.3.8
+PKG_EXT = tar.xz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = http://downloads.sourceforge.net/project/$(PKG_NAME)/Production
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+HOMEPAGE = http://sourceforge.net/projects/procps-ng/
+COMMENT  = procps-ng is a fork of the procps project. It contains free, kill, pkill, pgrep, pmap, ps, pwdx, skill, slabtop, snice, sysctl, tload, top, uptime, vmstat, w, and watch.
+LICENSE  = GPLv2
+
+GNU_CONFIGURE = 1
+
+CONFIGURE_ARGS = ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes --without-ncurses
+
+include ../../mk/spksrc.cross-cc.mk

cross/procps-ng/PLIST

@@ -0,0 +1,15 @@
+bin:bin/kill
+bin:bin/ps
+lnk:lib/libprocps.so
+lnk:lib/libprocps.so.1
+lib:lib/libprocps.so.1.1.2
+bin:sbin/sysctl
+bin:usr/bin/free
+bin:usr/bin/pgrep
+bin:usr/bin/pkill
+bin:usr/bin/pmap
+bin:usr/bin/pwdx
+bin:usr/bin/tload
+bin:usr/bin/uptime
+bin:usr/bin/vmstat
+bin:usr/bin/w

cross/procps-ng/digests

@@ -0,0 +1,3 @@
+procps-ng-3.3.8.tar.xz SHA1 4fa6a373f969989a9e490df5eb49a2df62eca19a
+procps-ng-3.3.8.tar.xz SHA256 a4109cfb6fe3bcfb5a0efb37efe04d0c8ce858bff3820d48cc258bad41bed46b
+procps-ng-3.3.8.tar.xz MD5 aecbeeda2ab308f8d09dddcb4cb9a572

spk/open-vm-tools/Makefile

@@ -1,16 +1,16 @@
 SPK_NAME = open-vm-tools
-SPK_VERS = 11.3.0
+SPK_VERS = 11.3.5
 SPK_REV = 1
 SPK_ICON = src/open-vm-tools.png
 BETA = 1
 
 DEPENDS = cross/$(SPK_NAME)
 
-MAINTAINER = neverEatYellowSwissSnow
+MAINTAINER = perrin-1
 DESCRIPTION = open-vm-tools is a set of services and modules that enable several features in VMware products for better management of, and seamless user interactions with, guests.
 RELOAD_UI = yes
 DISPLAY_NAME = VMware Tools
-CHANGELOG = "* 2021-06-23 open-vm-tools 11.3.0 SPK rev. 1"
+CHANGELOG = "SPK Open-vm-tools | 23 SEP 2021 | Build 18557794"
 
 HOMEPAGE = https://github.com/vmware/open-vm-tools
 LICENSE  = GPLv2/LGPLv2.1

spk/open-vm-tools/src/conf/privilege

@@ -1,34 +1,5 @@
 {
-	"defaults":{
-		"run-as": "package"
-	},
-	"username": "sc-open-vm-tools",
-	"ctrl-script": [{
-		"action": "preinst",
-		"run-as": "root"
-	}, {
-		"action": "postinst",
-		"run-as": "root"
-	}, {
-		"action": "preuninst",
-		"run-as": "root"
-	}, {
-		"action": "postuninst",
-		"run-as": "root"
-	}, {
-		"action": "preupgrade",
-		"run-as": "root"
-	}, {
-		"action": "postupgrade",
-		"run-as": "root"
-	}, {
-		"action": "start",
-		"run-as": "root"
-	}, {
-		"action": "stop",
-		"run-as": "root"
-	}, {
-		"action": "status",
-		"run-as": "root"
-	}]
+    "defaults": {
+        "run-as": "package"
+    }
 }

spk/open-vm-tools/src/service-setup.sh

@@ -1,26 +1,16 @@
 
 # Package specific behaviors
 # Sourced script by generic installer and start-stop-status scripts
-VMTOOLS_DIR="/usr/local/${SYNOPKG_PKGNAME}"
+VMTOOLS_DIR=${SYNOPKG_PKGDEST}
 VMTOOLS_DAEMON="${VMTOOLS_DIR}/bin/vmtoolsd"
-CONF_FILE=/etc/vmware-tools/tools.conf
+CONF_FILE=${VMTOOLS_DIR}/etc/vmware-tools/tools.conf
 
 PATH="${VMTOOLS_DIR}/bin:${PATH}"
 
 SERVICE_COMMAND="${VMTOOLS_DAEMON} -b ${PID_FILE} -c ${CONF_FILE}"
 
 service_postinst ()
 {
-    # Symlink
-    ln -s ${SYNOPKG_PKGDEST} ${VMTOOLS_DIR}
-
-    # create link for etc and lib
-    [ -e /etc/vmware-tools ] || ln -s ${SYNOPKG_PKGDEST}/etc/vmware-tools /etc/vmware-tools
-    [ -e /lib/open-vm-tools ] || ln -s ${SYNOPKG_PKGDEST}/lib/open-vm-tools /lib/open-vm-tools
-    if [ ! -e /lib/udev/rules.d/99-vmware-scsi-udev.rules ]; then
-        ln -s ${SYNOPKG_PKGDEST}/lib/udev/rules.d/99-vmware-scsi-udev.rules /lib/udev/rules.d/99-vmware-scsi-udev.rules
-        udevadm control --reload
-    fi
 
     cat > ${CONF_FILE} << EOF
 bindir = "${SYNOPKG_PKGDEST}/bin"	
@@ -33,11 +23,4 @@ service_postuninst ()
     # Remove link
     rm -f ${VMTOOLS_DIR}
 
-    # Remove link for etc and lib
-    [ -L /etc/vmware-tools ] && rm -f /etc/vmware-tools
-    [ -L /lib/open-vm-tools ] && rm -f /lib/open-vm-tools
-    if [ -L /lib/udev/rules.d/99-vmware-scsi-udev.rules ]; then
-        rm -f /lib/udev/rules.d/99-vmware-scsi-udev.rules
-        udevadm control --reload
-    fi
-}
+}