From 09afa1f85379b0367f1cf42d567ec5e1e1ce409d Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@bitmessage.ch>
Date: Fri, 29 Sep 2017 16:10:09 +0000
Subject: [PATCH] postmarketos-base: Execute setup-udev, remove mosh from
 dependencies (#647)

* postmarketos-base: Execute setup-udev, remove mosh from dependencies

* Run setup-udev [0], because that is what `setup-xorg-base` does [1].
It configures more than one OpenRC service and it also messes with the
runlevels. Only after running that, Hildon works (tested in Qemu).

[0]: https://github.com/alpinelinux/aports/blob/2fbea8b8dae00613de97862e509c6f76988ddeaf/main/eudev/setup-udev
[1]: https://github.com/alpinelinux/alpine-conf/blob/06300dd48343364aee4136dd6dd36e251188e8b8/setup-xorg-base.in#L25

* Remove `mosh` from `postmarketos-base` dependencies. I don't think anyone
uses it right now, and it's easy to add custom packages in `pmbootstrap init`
nowadays.

* Minor style changes in the `APKBUILD`
* [rx51] Remove udev-trigger service start
---
 device/device-nokia-rx51/APKBUILD             |  4 ++--
 .../device-nokia-rx51.post-install            |  2 --
 main/postmarketos-base/APKBUILD               | 22 ++++++++++++++-----
 .../postmarketos-base.post-install            |  8 +++++--
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/device/device-nokia-rx51/APKBUILD b/device/device-nokia-rx51/APKBUILD
index 6b0f9e549..881a2b151 100644
--- a/device/device-nokia-rx51/APKBUILD
+++ b/device/device-nokia-rx51/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-nokia-rx51
 pkgver=1
-pkgrel=20
+pkgrel=21
 pkgdesc="Nokia N900"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -68,4 +68,4 @@ df5dcae9a32d04ba2fed8b4dbb8722f8d56d063a288dfbaeca37806bdbb8ba4de639b392859b9f24
 7761aec6e6e219245b006e7bdc1d19812e9c5915cf3e64bb3dd46bb4b5570c1715650b53a1fc1007cb814076b5d81be0a66ba7ebf06d9a1fa4e364725c3ee633  acpi.map
 c9ff8b5968fe94007e1139db5ae76f3ee6c214356bff297b9672276c6adb332ba2342b6ca54cf7992d6556f3c68a13ef49ae5e61abe86154935514034170e228  rx51_us.map
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
-359ed3a0393c57ef7ba9c6ab3e908114df6848035863e1a1f23dffcf3309c02bb27e532cb6a086dbcc4a83447c9e42215757d139732d014d5b6a8ea62a12e4a0  device-nokia-rx51.post-install"
+7f9f251d08851edb6bd95db8e403d2e3a35d43106e580c922a91c0c4c769657e72645b0d85945bf22111e30df9e6565d62eb16f9dcd7d357569cd6f7c5266e41  device-nokia-rx51.post-install"
diff --git a/device/device-nokia-rx51/device-nokia-rx51.post-install b/device/device-nokia-rx51/device-nokia-rx51.post-install
index 4affc89e3..96ccb9139 100644
--- a/device/device-nokia-rx51/device-nokia-rx51.post-install
+++ b/device/device-nokia-rx51/device-nokia-rx51.post-install
@@ -11,8 +11,6 @@ rc-update add acpid default
 rc-update add hwdrivers boot
 # Enable networking service (requires /etc/interfaces, which is configured below)
 rc-update add networking default
-# Trigger udev on boot (necessary to get the nokia-modem stuff to register with udev)
-rc-update add udev-trigger default
 # Enable ofono
 rc-update add ofono default
 
diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
index 303f483a7..a940b9eed 100644
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@@ -1,12 +1,24 @@
 pkgname=postmarketos-base
 pkgver=3
-pkgrel=2
-pkgdesc="Meta package for minimal postmarketos base"
+pkgrel=3
+pkgdesc="Meta package for minimal postmarketOS base"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="GPL3+"
-depends="alpine-base haveged cryptsetup wpa_supplicant iw openssh mosh
-tmux htop nano postmarketos-mkinitfs eudev sudo util-linux"
+depends="
+	alpine-base
+	cryptsetup
+	eudev
+	haveged
+	htop
+	iw
+	nano
+	openssh
+	postmarketos-mkinitfs
+	sudo
+	tmux
+	util-linux
+	wpa_supplicant"
 makedepends=""
 install="$pkgname.post-install"
 subpackages=""
@@ -43,4 +55,4 @@ sha512sums="c6de3b44bc45b9f9c641a7e34c69a481ee39b99ac0251cd28f2b3aae49c1a8d1ca44
 3ceeee37f558e7c95ad973692b6a437f997e6b46c3d1c2257ddfb1529a5633477373aa123c7f08164e818daae50acb203d151379f27ca11bd458809e6a0d4de7  swapfile
 f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819  swapfile.init
 e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53  swapfile.conf
-c7ec6756ef3874a6102aa5a8b7a6e57a3663710ce2a705bbc5e74a6b78991778f6003be42fcd2bdaeaa875bfa1fca639881ddf50ccf57b7f2bb87d5c0d8a2f0e  postmarketos-base.post-install"
+eb447f592e0a179f3ae7c508925689a534b13deae8e5864810602ecc0e089d7ab9075dae6c8bf1b3d0415c70e5540305afd03cbba44204214ed2a70d2ee12a1a  postmarketos-base.post-install"
diff --git a/main/postmarketos-base/postmarketos-base.post-install b/main/postmarketos-base/postmarketos-base.post-install
index 06ba879cc..527fd165a 100644
--- a/main/postmarketos-base/postmarketos-base.post-install
+++ b/main/postmarketos-base/postmarketos-base.post-install
@@ -2,14 +2,18 @@
 
 . /etc/deviceinfo
 
-# Enable OpenRC services
+# Enable udev OpenRC services and runlevels
+# https://github.com/alpinelinux/aports/blob/master/main/eudev/setup-udev
+setup-udev -n
+
+# Enable other OpenRC services
 for service in devfs dmesg; do
 	rc-update -q add $service sysinit
 done
 for service in hwclock modules sysctl hostname bootmisc syslog; do
 	rc-update -q add $service boot
 done
-for service in dbus haveged sshd swapfile udev wpa_supplicant; do
+for service in dbus haveged sshd swapfile wpa_supplicant; do
 	rc-update -q add $service default
 done
 for service in mount-ro killprocs savecache; do