From f430dae13bb023fa110c98eda8264c4edfd02271 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Mon, 7 Dec 2020 12:58:11 +0100
Subject: [PATCH] main/postmarketos-base: add tinydm config (MR 1795)

Set postmarketOS default UID in tinydm config, so tinydm can be
upstreamed to Alpine without hardcoding the pmOS default UID in the
tinydm packaging.
---
 main/postmarketos-base/APKBUILD                 | 16 ++++++++++++++--
 main/postmarketos-base/rootfs-etc-conf.d-tinydm |  8 ++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 main/postmarketos-base/rootfs-etc-conf.d-tinydm

diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
index b1024e91d..b5ff6ffe8 100644
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=postmarketos-base
 pkgver=5
-pkgrel=2
+pkgrel=3
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -23,7 +23,11 @@ depends="
 	"
 install="$pkgname.post-install $pkgname.pre-upgrade"
 triggers="$pkgname.trigger=/etc"
-subpackages="$pkgname-x11 $pkgname-elogind"
+subpackages="
+	$pkgname-elogind
+	$pkgname-tinydm
+	$pkgname-x11
+	"
 options="!check"
 replaces="
 	alpine-base
@@ -43,6 +47,7 @@ _source644="
 	etc/chrony/chrony.conf
 	etc/conf.d/swapfile
 	etc/conf.d/syslog
+	etc/conf.d/tinydm
 	etc/conf.d/wpa_supplicant
 	etc/elogind/logind.conf
 	etc/fstab
@@ -113,11 +118,18 @@ elogind() {
 	postmarketos-mvcfg-package "$subpkgdir" "$subpkgname"
 }
 
+tinydm() {
+	install_if="$pkgname=$pkgver-r$pkgrel tinydm-openrc"
+	replaces="tinydm-openrc"
+	amove etc/conf.d/tinydm
+}
+
 sha512sums="e529f5cef1f31481b577f99b8917704f2cfefb963d98bf40a14b017938e55a00134d2033f81d2cb0b8489c5e9b4a92fdc0a788013f1adb4cd46d9580c9988186  rootfs-etc-sudoers
 67a031f309a3232ac1e8abc3fedeaee912c035f9c81b4f709248895905a27ab5844ec92c65e55b79af3894450ba3883549d4004f11efebb47114d41f730e4a5f  rootfs-etc-NetworkManager-conf.d-00-postmarketos.conf
 e5d049db1d82c510bab9246208b51b8ec2711d008d67792fc10d4c0b65ed4dece7b5ae3c3dd28a8539d177b6849c1f921cb9fef3d2c7bee0355451f7b4757ec6  rootfs-etc-chrony-chrony.conf
 e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53  rootfs-etc-conf.d-swapfile
 e4576c58c35f80bedddb1e89e186f37d31a186d3e9eb046581b8c5d7b7d435e18924539e851d3e67dc0ede80f9d44d16bd9ef52e73350d3f13224edc31d73a34  rootfs-etc-conf.d-syslog
+44e4283c6f77de83915977dd3bc2d8e2d96b3ed6cc68d3cc156304359ae649b5a8b0bac843e517ec6faa2066dd43ba85e313899b1eda04862f864fb9eb508aa0  rootfs-etc-conf.d-tinydm
 fe0651904c1f40ffa67d83daca190af199f63247e53642a59a1e1147cd06776fcf20b7b2fcc5373783d50b8bd6ce8d1354c8e5f4d582d319727b9ceefd1e8e16  rootfs-etc-conf.d-wpa_supplicant
 8d2c54fe3ca62c62f8337fb6be28479d0e02ea63f32abae81907f2768631e65c9e17485f8bc0854a013377f729b06dd1873e2b75f86f657ece866d00aecbbdb4  rootfs-etc-elogind-logind.conf
 9b8d0493bb64457fe176fea801e0771d3c5279302c61559824bf81b3d2b66d2c1e076f4aaac65f55389005acb18c27e44bed858c2bdbad37d74199f07c86c354  rootfs-etc-fstab
diff --git a/main/postmarketos-base/rootfs-etc-conf.d-tinydm b/main/postmarketos-base/rootfs-etc-conf.d-tinydm
new file mode 100644
index 000000000..25e594b95
--- /dev/null
+++ b/main/postmarketos-base/rootfs-etc-conf.d-tinydm
@@ -0,0 +1,8 @@
+# This file is provided by postmarketos-base.
+
+# this option is required for some DEs (e.g., Phosh) to be cleaned up fully so
+# they aren't automatically restarted by a child process
+rc_cgroup_cleanup="yes"
+
+# UID of user to autologin (pmOS default UID is 10000)
+AUTOLOGIN_UID=10000