From 0a202c17c228711c74f897a97016a046499e3ece Mon Sep 17 00:00:00 2001
From: Dylan Van Assche <me@dylanvanassche.be>
Date: Thu, 28 Jan 2021 20:25:21 +0100
Subject: [PATCH] main/postmarketos-ui-kodi: switch to tinydm (MR 1908)
---
main/postmarketos-ui-kodi/63-lightdm-autologin.conf | 5 -----
main/postmarketos-ui-kodi/APKBUILD | 11 ++++-------
.../postmarketos-ui-kodi.post-install | 5 ++---
3 files changed, 6 insertions(+), 15 deletions(-)
delete mode 100644 main/postmarketos-ui-kodi/63-lightdm-autologin.conf
diff --git a/main/postmarketos-ui-kodi/63-lightdm-autologin.conf b/main/postmarketos-ui-kodi/63-lightdm-autologin.conf
deleted file mode 100644
index 3a43c9e8c..000000000
--- a/main/postmarketos-ui-kodi/63-lightdm-autologin.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file gets removed with postmarketos-ui-kodi, even if modified!
-[Seat:*]
-autologin-user=username
-autologin-user-timeout=0
-autologin-session=kodi-wayland
diff --git a/main/postmarketos-ui-kodi/APKBUILD b/main/postmarketos-ui-kodi/APKBUILD
index b1e69a10b..5da4432d3 100644
--- a/main/postmarketos-ui-kodi/APKBUILD
+++ b/main/postmarketos-ui-kodi/APKBUILD
@@ -1,21 +1,18 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=postmarketos-ui-kodi
pkgver=1
-pkgrel=4
+pkgrel=5
pkgdesc="(Wayland) 10-foot UI useful on TV's"
url="https://kodi.tv"
arch="x86 x86_64 aarch64" # flatbuffers missing on armhf and armv7
license="GPL-3.0-or-later"
-depends="kodi-wayland kodi cage lightdm lightdm-openrc elogind pulseaudio upower"
+depends="kodi-wayland kodi cage tinydm tinydm-openrc elogind pulseaudio upower"
install="$pkgname.post-install $pkgname.post-upgrade"
-source="63-lightdm-autologin.conf kodi.desktop"
+source="kodi.desktop"
options="!check"
package() {
- install -Dm644 "$srcdir"/63-lightdm-autologin.conf \
- "$pkgdir"/usr/share/lightdm/lightdm.conf.d/63-autologin.conf
install -Dm644 "$srcdir"/kodi.desktop \
"$pkgdir"/usr/share/wayland-sessions/kodi-wayland.desktop
}
-sha512sums="4cbef7ef9b4da927e123ea28c5918f49ec4dc1367774596e1bc192f172e1e09cb9711015e20743a7fbb3bbbc8ca6df2bee66571a28fb530e2e9d24d945eb982a 63-lightdm-autologin.conf
-fc7d545310a77845af88638e95a72f8774be4fb91231554ac91a2dfcd65d11aed5e6cea550548df5e12c49963968a17a89429fc0fb3ebf4a6843d95dccad7eee kodi.desktop"
+sha512sums="fc7d545310a77845af88638e95a72f8774be4fb91231554ac91a2dfcd65d11aed5e6cea550548df5e12c49963968a17a89429fc0fb3ebf4a6843d95dccad7eee kodi.desktop"
diff --git a/main/postmarketos-ui-kodi/postmarketos-ui-kodi.post-install b/main/postmarketos-ui-kodi/postmarketos-ui-kodi.post-install
index 786f53d31..c63f8829c 100644
--- a/main/postmarketos-ui-kodi/postmarketos-ui-kodi.post-install
+++ b/main/postmarketos-ui-kodi/postmarketos-ui-kodi.post-install
@@ -1,5 +1,4 @@
#!/bin/sh
-sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/63-autologin.conf
-
-rc-update add lightdm default
+rc-update add tinydm default
+tinydm-set-session -s /usr/share/wayland-sessions/kodi-wayland.desktop