diff options
author | Jean-Marc Lenoir | 2018-01-10 00:44:06 +0100 |
---|---|---|
committer | Jean-Marc Lenoir | 2018-01-10 00:44:06 +0100 |
commit | fe7e26e5a1757f64867a1fbce456d9f6f07e8bd3 (patch) | |
tree | acf205d0bca716c9b41507c40ee101ba49e2d348 | |
parent | f0abbd18cbbd0e9c4f53a7c5c9d1d6e3fcf2cf40 (diff) | |
download | aur-fe7e26e5a1757f64867a1fbce456d9f6f07e8bd3.tar.gz |
Update to 14.1.1
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 16 | ||||
-rw-r--r-- | vmmon.patch | 108 |
3 files changed, 20 insertions, 122 deletions
@@ -1,7 +1,7 @@ pkgbase = vmware-workstation pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC. - pkgver = 14.1.0 - pkgrel = 5 + pkgver = 14.1.1 + pkgrel = 1 url = https://www.vmware.com/products/workstation-for-linux.html install = vmware-workstation.install arch = x86_64 @@ -37,7 +37,7 @@ pkgbase = vmware-workstation backup = etc/vmware/ssl/hostd.ssl.config backup = etc/pam.d/vmware-authd backup = etc/conf.d/vmware - source = https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-14.1.0-7370693.x86_64.bundle + source = https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-14.1.1-7528167.x86_64.bundle source = bootstrap source = vmware-vix-bootstrap source = config @@ -57,10 +57,10 @@ pkgbase = vmware-workstation source = Makefile source = vmmon.patch source = vmnet.patch - source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.1.0/7370838/packages/com.vmware.fusion.tools.darwinPre15.zip.tar - source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.1.0/7370838/packages/com.vmware.fusion.tools.darwin.zip.tar + source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.1.1/7520154/packages/com.vmware.fusion.tools.darwinPre15.zip.tar + source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.1.1/7520154/packages/com.vmware.fusion.tools.darwin.zip.tar source = unlocker.py - sha256sums = 522f368c3ce009b4cd442c25215b022fc09a520a668b4e3189af5194f50ca14a + sha256sums = f010fe9f6ad1653f7d33e7ac29abee26a06cfabe9eb58f23547dfd9df05889f6 sha256sums = 12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e sha256sums = da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141 sha256sums = d9a5f8b919d52aa2f279d8eaf0bb495780eb9fd8bbc2c58bba223cdca78cc991 @@ -78,10 +78,10 @@ pkgbase = vmware-workstation sha256sums = d7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d sha256sums = 05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487 sha256sums = 6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d - sha256sums = 4e7a3393d8bae5e3ec6100a5c4a8798c39491869be20c584ae3f75e2fad05168 + sha256sums = 770dba99484b70eba0461441a8d122f183616c408a544a98499e443a6ee8fd05 sha256sums = 11304179df067e1e75f8268dd218f27db5a502f52b79b642f64f464d06bc3f7b - sha256sums = 70ee05c2e6098644a619fd0e1f742facd5f234e62d7095ef99186e8af8d6b882 - sha256sums = a18688c5ccbebe3822f71a357e879bec6dd9a5698833d13fd0f27ee72adab1fc + sha256sums = 0cdf4279a48ea915c796c0a230a3483dc9095bbd00fe4287889f0403ead93165 + sha256sums = 9365045b6116f76bcc46436ad73439ee89893c7c5187cf9f3869c12bc2444b0a sha256sums = b739b0c99fb20dc44838ce137e254773b7be051f327eb67fd8cb1342a3ecf344 pkgname = vmware-workstation @@ -14,10 +14,10 @@ #PKGEXT=.pkg.tar pkgname=vmware-workstation -pkgver=14.1.0 -_buildver=7370693 +pkgver=14.1.1 +_buildver=7528167 _pkgver=${pkgver}_${_buildver} -pkgrel=5 +pkgrel=1 pkgdesc='The industry standard for running multiple operating systems as virtual machines on a single Linux PC.' arch=(x86_64) url='https://www.vmware.com/products/workstation-for-linux.html' @@ -90,7 +90,7 @@ source=( 'vmnet.patch' ) sha256sums=( - '522f368c3ce009b4cd442c25215b022fc09a520a668b4e3189af5194f50ca14a' + 'f010fe9f6ad1653f7d33e7ac29abee26a06cfabe9eb58f23547dfd9df05889f6' '12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e' 'da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141' @@ -112,7 +112,7 @@ sha256sums=( '05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487' '6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d' - '4e7a3393d8bae5e3ec6100a5c4a8798c39491869be20c584ae3f75e2fad05168' + '770dba99484b70eba0461441a8d122f183616c408a544a98499e443a6ee8fd05' '11304179df067e1e75f8268dd218f27db5a502f52b79b642f64f464d06bc3f7b' ) options=(!strip emptydirs) @@ -122,7 +122,7 @@ _isoimages=(freebsd linux linuxPreGlibc25 netware solaris windows winPre2k winPr if [ -n "$_enable_macOS_guests" ]; then -_vmware_fusion_ver=10.1.0_7370838 +_vmware_fusion_ver=10.1.1_7520154 # List of VMware Fusion versions: https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/ makedepends+=( @@ -137,8 +137,8 @@ source+=( 'unlocker.py' ) sha256sums+=( - '70ee05c2e6098644a619fd0e1f742facd5f234e62d7095ef99186e8af8d6b882' - 'a18688c5ccbebe3822f71a357e879bec6dd9a5698833d13fd0f27ee72adab1fc' + '0cdf4279a48ea915c796c0a230a3483dc9095bbd00fe4287889f0403ead93165' + '9365045b6116f76bcc46436ad73439ee89893c7c5187cf9f3869c12bc2444b0a' 'b739b0c99fb20dc44838ce137e254773b7be051f327eb67fd8cb1342a3ecf344' ) diff --git a/vmmon.patch b/vmmon.patch index 1b812a0ab760..a8d36efcc07d 100644 --- a/vmmon.patch +++ b/vmmon.patch @@ -45,57 +45,10 @@ index 2af7372..729aedc 100644 +#endif + #endif /* __COMPAT_MODULE_H__ */ -diff --git a/vmmon-only/include/compat_timer.h b/vmmon-only/include/compat_timer.h -new file mode 100644 -index 0000000..b68d9b2 ---- /dev/null -+++ b/vmmon-only/include/compat_timer.h -@@ -0,0 +1,33 @@ -+#ifndef __COMPAT_TIMER_H__ -+#define __COMPAT_TIMER_H__ -+ -+#include <linux/timer.h> -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)) && !defined(timer_setup) -+ -+typedef unsigned long compat_timer_arg_t; -+ -+static inline void compat_timer_setup(struct timer_list *timer, -+ void (*func)(compat_timer_arg_t), -+ unsigned int flags) -+{ -+ init_timer(timer); -+ timer->function = func; -+ timer->data = 0; -+ timer->flags = flags; -+} -+ -+#else /* new timer interface since 4.15 */ -+ -+typedef struct timer_list *compat_timer_arg_t; -+ -+static inline void compat_timer_setup(struct timer_list *timer, -+ void (*func)(compat_timer_arg_t), -+ unsigned int flags) -+{ -+ timer_setup(timer, func, flags); -+} -+ -+#endif /* new timer interface since 4.15 */ -+ -+#endif /* __COMPAT_TIMER_H__ */ diff --git a/vmmon/linux/driver.c b/vmmon/linux/driver.c index 87cf45b..5390a93 100644 --- a/vmmon/linux/driver.c +++ b/vmmon/linux/driver.c -@@ -21,6 +21,7 @@ - - #define EXPORT_SYMTAB - -+#include "compat_timer.h" - #include <linux/file.h> - #include <linux/highmem.h> - #include <linux/mm.h> @@ -109,7 +109,15 @@ static struct vm_operations_struct vmuser_mops = { .fault = LinuxDriverFault }; @@ -113,26 +66,7 @@ index 87cf45b..5390a93 100644 static struct timer_list tscTimer; static Atomic_uint32 tsckHz; static VmTimeStart tsckHzStartTime; -@@ -216,7 +217,7 @@ LinuxDriverEstimateTSCkHz(void) - *---------------------------------------------------------------------- - */ - static void --LinuxDriverEstimateTSCkHzDeferred(unsigned long data) -+LinuxDriverEstimateTSCkHzDeferred(compat_timer_arg_t unused) - { - LinuxDriverEstimateTSCkHz(); - } -@@ -251,9 +252,7 @@ LinuxDriverInitTSCkHz(void) - } - - LinuxDriverReadTSCAndUptime(&tsckHzStartTime); -- tscTimer.function = LinuxDriverEstimateTSCkHzDeferred; - tscTimer.expires = jiffies + 4 * HZ; -- tscTimer.data = 0; - add_timer(&tscTimer); - } - -@@ -295,20 +304,6 @@ init_module(void) +@@ -293,20 +301,6 @@ init_module(void) linuxState.fastClockRate = 0; linuxState.swapSize = VMMON_UNKNOWN_SWAP_SIZE; @@ -153,16 +87,7 @@ index 87cf45b..5390a93 100644 #ifdef VMX86_DEVEL devel_init_module(); linuxState.minor = 0; -@@ -335,7 +334,7 @@ init_module(void) - linuxState.deviceName, linuxState.major, linuxState.minor); - - HostIF_InitUptime(); -- init_timer(&tscTimer); -+ compat_timer_setup(&tscTimer, LinuxDriverEstimateTSCkHzDeferred, 0); - LinuxDriverInitTSCkHz(); - Vmx86_InitIDList(); - -@@ -364,7 +373,9 @@ cleanup_module(void) +@@ -368,7 +362,9 @@ cleanup_module(void) #ifdef VMX86_DEVEL unregister_chrdev(linuxState.major, linuxState.deviceName); #else @@ -173,7 +98,7 @@ index 87cf45b..5390a93 100644 #endif Log("Module %s: unloaded\n", linuxState.deviceName); -@@ -977,7 +988,7 @@ LinuxDriverReadTSC(void *data, // OUT: TSC values +@@ -981,7 +977,7 @@ LinuxDriverReadTSC(void *data, // OUT: TSC values *----------------------------------------------------------------------------- */ @@ -186,14 +111,6 @@ diff --git a/vmmon/linux/hostif.c b/vmmon/linux/hostif.c index fd32013..583d6da 100644 --- a/vmmon/linux/hostif.c +++ b/vmmon/linux/hostif.c -@@ -29,6 +29,7 @@ - #include "driver-config.h" - - /* Must come before vmware.h --hpreg */ -+#include "compat_timer.h" - #include <linux/binfmts.h> - #include <linux/delay.h> - #include <linux/file.h> @@ -36,6 +36,9 @@ #include <linux/vmalloc.h> @@ -223,22 +140,3 @@ index fd32013..583d6da 100644 static struct { Atomic_uint64 uptimeBase; VersionedAtomic version; -@@ -1705,7 +1714,7 @@ HostIFReadUptimeWork(unsigned long *j) // OUT: current jiffies - */ - - static void --HostIFUptimeResyncMono(unsigned long data) // IN: ignored -+HostIFUptimeResyncMono(compat_timer_arg_t unused) // IN: ignored - { - unsigned long jifs; - uintptr_t flags; -@@ -1767,8 +1776,7 @@ HostIF_InitUptime(void) - -(tv.tv_usec * (UPTIME_FREQ / 1000000) + - tv.tv_sec * UPTIME_FREQ)); - -- init_timer(&uptimeState.timer); -- uptimeState.timer.function = HostIFUptimeResyncMono; -+ compat_timer_setup(&uptimeState.timer, HostIFUptimeResyncMono, 0); - mod_timer(&uptimeState.timer, jiffies + HZ); - } - |