diff options
| -rw-r--r-- | .SRCINFO | 30 | ||||
| -rw-r--r-- | PKGBUILD | 43 | ||||
| -rw-r--r-- | config | 2 | ||||
| -rwxr-xr-x | configure-initscript.sh | 10 | ||||
| -rw-r--r-- | vmware-bootstrap | 2 | ||||
| -rwxr-xr-x | vmware-networks | 22 | ||||
| -rwxr-xr-x | vmware-networks-configuration | 11 | ||||
| -rw-r--r-- | vmware-networks-configuration.service | 9 | ||||
| -rw-r--r-- | vmware-networks.path | 8 | ||||
| -rw-r--r-- | vmware-networks.service | 13 | ||||
| -rwxr-xr-x | vmware-usbarbitrator | 7 | ||||
| -rw-r--r-- | vmware-usbarbitrator.path | 8 | ||||
| -rw-r--r-- | vmware-usbarbitrator.service | 8 |
13 files changed, 81 insertions, 92 deletions
@@ -1,5 +1,5 @@ -pkgbase = vmware-workstation - pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC. +pkgbase = vmware-workstation-openrc + pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC. Modified to use OpenRC. pkgver = 17.5.1 pkgrel = 1 url = https://www.vmware.com/products/workstation-for-linux.html @@ -20,10 +20,12 @@ pkgbase = vmware-workstation depends = vmware-keymaps optdepends = linux-headers: build modules against Arch kernel provides = vmware-ovftool + provides = vmware-workstation conflicts = vmware-modules-dkms conflicts = vmware-ovftool conflicts = vmware-patch conflicts = vmware-systemd-services + conflicts = vmware-workstation options = !strip options = emptydirs backup = etc/vmware/config @@ -34,29 +36,25 @@ pkgbase = vmware-workstation source = config source = configure-initscript.sh source = vmware-environment.sh - source = vmware-networks-configuration.service - source = vmware-networks.service - source = vmware-usbarbitrator.service - source = vmware-networks.path - source = vmware-usbarbitrator.path + source = vmware-networks-configuration + source = vmware-networks + source = vmware-usbarbitrator source = dkms.conf.in source = Makefile source = vmmon.patch source = vmnet.patch sha256sums = aa60b7cef2a87acefbcf7c7a5242c7b09d7b910acbd5afebc5ef6617e50c7496 - sha256sums = 12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e + sha256sums = 67edc40e39686281f5101ced1a250648ae32e4cd5dffe4fd47bc3c7aed929d50 sha256sums = da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141 - sha256sums = ac81b0470feebba36482fbb2a9f641fef98924711bf761c0e6fdec67178194de - sha256sums = 48d203450db426e8780f3696a2cf85ee08db004e93f8aca50a9aa24129b1e839 + sha256sums = bcf24ce469527844c60f8fd50fda61a6b65cc326ff6bf026d5ae0576cf749c2c + sha256sums = f2c9272dfa1e3de1de5f5545989e6e3d9f400084decaa5504559a20209648329 sha256sums = b94959a11b28e51b541321be0588190eb10825e9ff55cbd16eb01483a839a69f - sha256sums = 9b4fbe0ba83f761a2eb9ecd05d48428f8b0a5b3abd8404ccbd928408e682f02b - sha256sums = c0a5aea785db06921fb350d36d5e0fd9a14f5eee0c835686ec6fea1af8c92245 - sha256sums = d7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d - sha256sums = 16a73931894a65d43da489ff25d07647c0ecddf60d443b103bceca63504910fe - sha256sums = fe1b1be8297f4170406f97dd1f8b385d911faf45afe19cbc0c26b8092b3ddf8d + sha256sums = 6114cab1760bd1393de2ed16d9bc6f01c013a706e1b0a0a7fc34156d6adb7ae9 + sha256sums = 8534321485f16783a70f8ce78ca04599756a98b955b046af623910e1ee6e412c + sha256sums = 452c1bfebac52f4808ba5f4bf2fc3eae9858f8745d60c13d3c46e7550a3e1eb1 sha256sums = 10562d11d50edab9abc2b29c8948714edcb9b084f99b3766d07ddd21259e372e sha256sums = 273d4357599a3e54259c78cc49054fef8ecfd2c2eda35cbcde3a53a62777a5ac sha256sums = 6b7c5dbf7d2237496943aca10b0e7337ed4da32ff80767fe2566a78c2fe6bf1e sha256sums = cf64b63e2afed22cec1983cf8e1a4d9492a5df2e9eb468cc3205e7e086a67b47 -pkgname = vmware-workstation +pkgname = vmware-workstation-openrc @@ -1,4 +1,5 @@ -# Maintainer: Jean-Marc Lenoir <archlinux "at" jihemel "dot" com> +# Maintainer: randomnobody <nobody "at" 420blaze "dot" it> +# Contributor: Jean-Marc Lenoir <archlinux "at" jihemel "dot" com> # Contributor: Maxwell Pray a.k.a. Synthead <synthead@gmail.com> # To enable macOS guests support, uncomment the line below: @@ -13,12 +14,12 @@ #_remove_vmware_keymaps_dependency=y #PKGEXT=.pkg.tar -pkgname=vmware-workstation +pkgname=vmware-workstation-openrc pkgver=17.5.1 _buildver=23298084 _pkgver=${pkgver}_${_buildver} pkgrel=1 -pkgdesc='The industry standard for running multiple operating systems as virtual machines on a single Linux PC.' +pkgdesc='The industry standard for running multiple operating systems as virtual machines on a single Linux PC. Modified to use OpenRC.' arch=(x86_64) url='https://www.vmware.com/products/workstation-for-linux.html' license=(custom) @@ -28,9 +29,11 @@ conflicts=( vmware-ovftool vmware-patch vmware-systemd-services + vmware-workstation ) provides=( vmware-ovftool + vmware-workstation ) depends=( dkms @@ -64,11 +67,9 @@ source=( 'configure-initscript.sh' 'vmware-environment.sh' - 'vmware-networks-configuration.service' - 'vmware-networks.service' - 'vmware-usbarbitrator.service' - 'vmware-networks.path' - 'vmware-usbarbitrator.path' + 'vmware-networks-configuration' + 'vmware-networks' + 'vmware-usbarbitrator' 'dkms.conf.in' 'Makefile' @@ -78,17 +79,15 @@ source=( sha256sums=( 'aa60b7cef2a87acefbcf7c7a5242c7b09d7b910acbd5afebc5ef6617e50c7496' - '12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e' + '67edc40e39686281f5101ced1a250648ae32e4cd5dffe4fd47bc3c7aed929d50' 'da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141' - 'ac81b0470feebba36482fbb2a9f641fef98924711bf761c0e6fdec67178194de' - '48d203450db426e8780f3696a2cf85ee08db004e93f8aca50a9aa24129b1e839' + 'bcf24ce469527844c60f8fd50fda61a6b65cc326ff6bf026d5ae0576cf749c2c' + 'f2c9272dfa1e3de1de5f5545989e6e3d9f400084decaa5504559a20209648329' 'b94959a11b28e51b541321be0588190eb10825e9ff55cbd16eb01483a839a69f' - '9b4fbe0ba83f761a2eb9ecd05d48428f8b0a5b3abd8404ccbd928408e682f02b' - 'c0a5aea785db06921fb350d36d5e0fd9a14f5eee0c835686ec6fea1af8c92245' - 'd7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d' - '16a73931894a65d43da489ff25d07647c0ecddf60d443b103bceca63504910fe' - 'fe1b1be8297f4170406f97dd1f8b385d911faf45afe19cbc0c26b8092b3ddf8d' + '6114cab1760bd1393de2ed16d9bc6f01c013a706e1b0a0a7fc34156d6adb7ae9' + '8534321485f16783a70f8ce78ca04599756a98b955b046af623910e1ee6e412c' + '452c1bfebac52f4808ba5f4bf2fc3eae9858f8745d60c13d3c46e7550a3e1eb1' '10562d11d50edab9abc2b29c8948714edcb9b084f99b3766d07ddd21259e372e' '273d4357599a3e54259c78cc49054fef8ecfd2c2eda35cbcde3a53a62777a5ac' @@ -269,15 +268,13 @@ fi echo -e "vmw_vmci\nvmmon" > "$pkgdir/usr/lib/modules-load.d/vmware.conf" for service_file in \ - vmware-networks-configuration.service \ - vmware-networks.service \ - vmware-usbarbitrator.service \ - vmware-networks.path \ - vmware-usbarbitrator.path + vmware-networks-configuration \ + vmware-networks \ + vmware-usbarbitrator do - install -Dm 644 \ + install -Dm 755 \ "$srcdir/$service_file" \ - "$pkgdir/usr/lib/systemd/system/$service_file" + "$pkgdir/etc/init.d/$service_file" done @@ -8,7 +8,7 @@ vix.config.version = "1" bindir = "/usr/bin" libdir = "/usr/lib/vmware" vix.libdir = "/usr/lib/vmware-vix" -initscriptdir = "/usr/lib/systemd/scripts" +initscriptdir = "/etc/init.d" vmware.fullpath = "/usr/bin/vmware" authd.fullpath = "/usr/bin/vmware-authd" gksu.rootMethod = "su" diff --git a/configure-initscript.sh b/configure-initscript.sh index 8fe7eb16ea73..a0744156e5ee 100755 --- a/configure-initscript.sh +++ b/configure-initscript.sh @@ -13,15 +13,15 @@ stopLevel="$4" addService() { if [ "$serviceName" != "vmware" ]; then - systemctl start $serviceName.service - systemctl enable $serviceName.service + rc-service $serviceName start + rc-update add $serviceName default fi } removeService() { if [ "$serviceName" != "vmware" ]; then - systemctl stop $serviceName.service - systemctl disable $serviceName.service + rc-service $serviceName stop + rc-update delete $serviceName default fi } @@ -30,7 +30,7 @@ checkService() { if [ "$serviceName" = "vmware" ]; then retval=0 else - systemctl is-active $serviceName.service > /dev/null + rc-service $serviceName status > /dev/null retval=$? fi diff --git a/vmware-bootstrap b/vmware-bootstrap index 981b82191cca..2abeeba254ae 100644 --- a/vmware-bootstrap +++ b/vmware-bootstrap @@ -8,4 +8,4 @@ DOCDIR="/usr/share/doc" MANDIR="/usr/share/man" INCLUDEDIR="/usr/include" INITDIR="" -INITSCRIPTDIR="/usr/lib/systemd/scripts" +INITSCRIPTDIR="/etc/init.d" diff --git a/vmware-networks b/vmware-networks new file mode 100755 index 000000000000..4c5ad6531fbb --- /dev/null +++ b/vmware-networks @@ -0,0 +1,22 @@ +#!/sbin/openrc-run + +name=$RC_SVCNAME +description="VMware Networks" +command="/usr/bin/vmware-networks" +command_args="--start" +pidfile="undefined" + +start_pre() { + modprobe vmnet +} + +depend() { + after vmware-networks-configuration + use vmware-networks-configuration +} + +stop() { + ebegin "Stopping $RC_SVCNAME" + /usr/bin/vmware-networks --stop + eend $? +} diff --git a/vmware-networks-configuration b/vmware-networks-configuration new file mode 100755 index 000000000000..7d8f2922e807 --- /dev/null +++ b/vmware-networks-configuration @@ -0,0 +1,11 @@ +#!/sbin/openrc-run + +name=$RC_SVCNAME +description="VMware Networks Configuration Generation" +command="/usr/bin/vmware-networks" +command_args="--postinstall vmware-player,0,1" +start_stop_daemon_args=" -k 0077" + +start_pre() { + modprobe vmnet +} diff --git a/vmware-networks-configuration.service b/vmware-networks-configuration.service deleted file mode 100644 index 0d86867f955e..000000000000 --- a/vmware-networks-configuration.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=VMware Networks Configuration Generation -ConditionPathExists=!/etc/vmware/networking - -[Service] -UMask=0077 -ExecStart=/usr/bin/vmware-networks --postinstall vmware-player,0,1 -Type=oneshot -RemainAfterExit=yes diff --git a/vmware-networks.path b/vmware-networks.path deleted file mode 100644 index fb53ff4ba642..000000000000 --- a/vmware-networks.path +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Monitor to Load-On-Demand the VMware Networks service - -[Path] -PathExistsGlob=/var/run/vmware/*/* - -[Install] -WantedBy=paths.target diff --git a/vmware-networks.service b/vmware-networks.service deleted file mode 100644 index 7d520a28a88d..000000000000 --- a/vmware-networks.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=VMware Networks -Wants=vmware-networks-configuration.service -After=vmware-networks-configuration.service - -[Service] -Type=forking -ExecStartPre=-/sbin/modprobe vmnet -ExecStart=/usr/bin/vmware-networks --start -ExecStop=/usr/bin/vmware-networks --stop - -[Install] -WantedBy=multi-user.target diff --git a/vmware-usbarbitrator b/vmware-usbarbitrator new file mode 100755 index 000000000000..f70967671337 --- /dev/null +++ b/vmware-usbarbitrator @@ -0,0 +1,7 @@ +#!/sbin/openrc-run + +name=$RC_SVCNAME +description="VMware USB Arbitrator" +supervisor="supervise-daemon" +command="/usr/lib/vmware/bin/vmware-usbarbitrator" +command_args="-f" diff --git a/vmware-usbarbitrator.path b/vmware-usbarbitrator.path deleted file mode 100644 index e56473635d8b..000000000000 --- a/vmware-usbarbitrator.path +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Monitor to Load-On-Demand the VMware USB Arbitrator - -[Path] -PathExistsGlob=/var/run/vmware/*/* - -[Install] -WantedBy=paths.target diff --git a/vmware-usbarbitrator.service b/vmware-usbarbitrator.service deleted file mode 100644 index fd1d9cac8034..000000000000 --- a/vmware-usbarbitrator.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=VMware USB Arbitrator - -[Service] -ExecStart=/usr/lib/vmware/bin/vmware-usbarbitrator -f - -[Install] -WantedBy=multi-user.target |