summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD24
-rw-r--r--readme.install25
3 files changed, 30 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e03403a47e2a..2680f2a65847 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,23 @@
# Generated by mksrcinfo v8
-# Thu Jun 14 18:16:26 UTC 2018
+# Mon Apr 29 15:33:53 UTC 2019
pkgbase = kodi-standalone-service
pkgdesc = Systemd service to run kodi in stand-alone mode without a DE
- pkgver = 1.94
+ pkgver = 1.95
pkgrel = 1
url = https://github.com/graysky2/kodi-standalone-service
install = readme.install
arch = x86_64
license = GPL
- depends = systemd
- depends = xorg-server
- depends = xorg-xinit
+ source = https://github.com/graysky2/kodi-standalone-service/archive/v1.95.tar.gz
+ sha256sums = da49c9f1cf6dad28ca88904db1d8b676cd935781a58f7c7917523e28a5bf74c8
+
+pkgname = kodi-standalone-service
depends = kodi
depends = polkit
- replaces = xbmc-standalone-service
- source = https://github.com/graysky2/kodi-standalone-service/archive/v1.94.tar.gz
- sha256sums = c2796a8520fbb366263f38df007e9b292a26870e71b7c166465a18e210a90a96
+ depends = xorg-server
+ depends = xorg-xinit
-pkgname = kodi-standalone-service
+pkgname = kodi-standalone-gbm-service
+ depends = kodi-gbm
+ depends = polkit
diff --git a/PKGBUILD b/PKGBUILD
index f6e28ab5c7ee..497c0ff67436 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
# Maintainer: graysky <graysky AT archlinux DOT us>
-pkgname=kodi-standalone-service
-pkgver=1.94
+pkgbase=kodi-standalone-service
+pkgname=(kodi-standalone-service kodi-standalone-gbm-service)
+pkgver=1.95
pkgrel=1
pkgdesc="Systemd service to run kodi in stand-alone mode without a DE"
# Do NOT attempt to use this package on Arch ARM! This is only for x86_64.
@@ -9,17 +10,24 @@ pkgdesc="Systemd service to run kodi in stand-alone mode without a DE"
arch=('x86_64')
url="https://github.com/graysky2/kodi-standalone-service"
license=('GPL')
-depends=('systemd' 'xorg-server' 'xorg-xinit' 'kodi' 'polkit')
-replaces=('xbmc-standalone-service')
install=readme.install
-source=("https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('c2796a8520fbb366263f38df007e9b292a26870e71b7c166465a18e210a90a96')
+source=("https://github.com/graysky2/$pkgbase/archive/v$pkgver.tar.gz")
+sha256sums=('da49c9f1cf6dad28ca88904db1d8b676cd935781a58f7c7917523e28a5bf74c8')
-package() {
- install -Dm644 "$srcdir/$pkgname-$pkgver/init/kodi.service" \
+package_kodi-standalone-service() {
+ depends=('kodi' 'polkit' 'xorg-server' 'xorg-xinit')
+ install -Dm644 "$srcdir/$pkgbase-$pkgver/init/kodi.service" \
"$pkgdir/usr/lib/systemd/system/kodi.service"
install -dm 700 "$pkgdir"/var/lib/kodi
chown 420:420 "$pkgdir"/var/lib/kodi
}
+package_kodi-standalone-gbm-service() {
+ depends=('kodi-gbm' 'polkit')
+ install -Dm644 "$srcdir/$pkgbase-$pkgver/init/kodi-gbm.service" \
+ "$pkgdir/usr/lib/systemd/system/kodi-gbm.service"
+ install -dm 700 "$pkgdir"/var/lib/kodi
+ chown 420:420 "$pkgdir"/var/lib/kodi
+}
+
# vim:set ts=2 sw=2 et:
diff --git a/readme.install b/readme.install
index 3fe317b8871e..f0e39616c428 100644
--- a/readme.install
+++ b/readme.install
@@ -1,40 +1,21 @@
post_install() {
getent group kodi > /dev/null || groupadd -g 420 kodi
if ! getent passwd kodi > /dev/null; then
- useradd -c 'kodi user' -u 420 -g kodi -G audio,video,network,optical \
+ useradd -c 'kodi user' -u 420 -g kodi -G audio,input,network,optical,video \
-d /var/lib/kodi -s /usr/bin/nologin kodi
passwd -l kodi > /dev/null
[[ ! -d /var/lib/kodi/.kodi ]] &&
mkdir /var/lib/kodi/.kodi &&
chown -R kodi:kodi /var/lib/kodi/.kodi
fi
-
- echo "==> Some drivers including Xorg's native modesetting may require the addition"
- echo "==> of /etc/X11/Xwrapper.config for X to initialize. If kodi.service fails to"
- echo "==> start, create that file containing the following single line:"
- echo "==> needs_root_rights = yes"
- echo "==> See: https://wiki.archlinux.org/index.php/Xorg#Rootless_Xorg_.28v1.16.29"
}
post_upgrade() {
- post_install $1
- if ! getent group kodi | cut -d: -f3 | grep 420 > /dev/null 2>&1; then
- groupmod -g 420 kodi > /dev/null 2>&1
- fi
- if ! id -u kodi | grep 420 > /dev/null 2>&1; then
- usermod -u 420 kodi > /dev/null 2>&1
- if [[ $? -ne 0 ]]; then
- echo "==> Changing uid of user kodi failed."
- echo "==> It is recommended that the uid is changed."
- echo "==> Stop all processes running under the kodi user and reinstall kodi"
- echo "==> or change the uid manually. (usermod -u 420 kodi)"
- fi
- chown -R kodi:kodi /var/lib/kodi
- fi
+ usermod -g kodi -G audio,input,network,optical,video kodi
}
post_remove() {
- echo "==> Delete the kodi user if you are certain no processes are running under it."
+ echo "==> Optionally delete the kodi user if you are certain no processes are running under it."
echo "==> userdel kodi"
echo "==> groupdel kodi"
}