summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Marc Lenoir2020-06-01 21:42:11 +0200
committerJean-Marc Lenoir2020-06-01 21:42:11 +0200
commit4e9cb2b9189a8f386882e8db6167ac71bb557553 (patch)
tree5df20ebce9a0cd492552f04b35b0ee3927f01a2a
parentff76796996da1e89466660af043f62dfd27ab472 (diff)
downloadaur-4e9cb2b9189a8f386882e8db6167ac71bb557553.tar.gz
Compatibility with Linux 5.7
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
-rw-r--r--vmmon.patch8
-rw-r--r--vmnet.patch9
4 files changed, 23 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index daada777be4f..c4e32d9bd9af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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 = 15.5.5
- pkgrel = 1
+ pkgrel = 2
url = https://www.vmware.com/products/workstation-for-linux.html
install = vmware-workstation.install
arch = x86_64
@@ -78,8 +78,8 @@ pkgbase = vmware-workstation
sha256sums = d7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d
sha256sums = 05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487
sha256sums = 6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d
- sha256sums = 1060b5d45caeda5119b220fab4e1ece398af34d75131139a5dc6f74ee06672c3
- sha256sums = 7c3b6a7871b19e31fafdcc2631751dd9569196740d8e7c2026653d155c0c8da0
+ sha256sums = f23aa17b29cc95b9e78f27d862a95f5f3da6608096646d175f305f9ac1b8f54a
+ sha256sums = c1302d45008865537583b99d53ed0ea4a1d672227f190177fc63fc0c2f980151
pkgname = vmware-workstation
diff --git a/PKGBUILD b/PKGBUILD
index 34380ec03d88..3238bfd8a183 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ pkgname=vmware-workstation
pkgver=15.5.5
_buildver=16285975
_pkgver=${pkgver}_${_buildver}
-pkgrel=1
+pkgrel=2
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'
@@ -116,8 +116,8 @@ sha256sums=(
'05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487'
'6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d'
- '1060b5d45caeda5119b220fab4e1ece398af34d75131139a5dc6f74ee06672c3'
- '7c3b6a7871b19e31fafdcc2631751dd9569196740d8e7c2026653d155c0c8da0'
+ 'f23aa17b29cc95b9e78f27d862a95f5f3da6608096646d175f305f9ac1b8f54a'
+ 'c1302d45008865537583b99d53ed0ea4a1d672227f190177fc63fc0c2f980151'
)
options=(!strip emptydirs)
diff --git a/vmmon.patch b/vmmon.patch
index f2e32d6d0270..b44cd19ad7c3 100644
--- a/vmmon.patch
+++ b/vmmon.patch
@@ -12,3 +12,11 @@
# Header directory for the running kernel
ifdef LINUXINCLUDE
+@@ -137,7 +137,7 @@
+ endif
+
+ # Add Spectre options when available
+-CC_OPTS += $(call vm_check_gcc,-mindirect-branch=thunk -mindirect-branch-register,)
++CC_OPTS += $(call vm_check_gcc,-mindirect-branch-register,)
+
+ include $(SRCROOT)/Makefile.kernel
diff --git a/vmnet.patch b/vmnet.patch
index 60fc5a12d86f..92215df5fd24 100644
--- a/vmnet.patch
+++ b/vmnet.patch
@@ -12,3 +12,12 @@
# Header directory for the running kernel
ifdef LINUXINCLUDE
+@@ -137,7 +137,7 @@
+ endif
+
+ # Add Spectre options when available
+-CC_OPTS += $(call vm_check_gcc,-mindirect-branch=thunk -mindirect-branch-register,)
++CC_OPTS += $(call vm_check_gcc,-mindirect-branch-register,)
+
+ include $(SRCROOT)/Makefile.kernel
+