main/mobile-config-firefox/APKBUILD

 # Maintainer: Oliver Smith <ollieparaoid@postmarketos.org>
 pkgname=mobile-config-firefox
-pkgver=3.0.0_rc1
+pkgver=3.0.0
 pkgrel=0
 pkgdesc="Firefox tweaks for mobile and privacy"
 url="https://gitlab.com/postmarketOS/mobile-config-firefox"
 source="
 	https://gitlab.com/postmarketOS/mobile-config-firefox/-/archive/$pkgver/mobile-config-firefox-$pkgver.tar.bz2
-	distro_links.html
 "
 arch="noarch"
 license="GPL-3.0-or-later"
@@ -14,19 +13,13 @@ options="!check" # No tests
 replaces="postmarketos-config-firefox"
 provides="postmarketos-config-firefox=$pkgver"
 
-prepare() {
-	default_prepare
-	cp "$srcdir/distro_links.html" "$builddir/src/homepage"
-}
-
 build() {
-	make DISTRO=postmarketOS
+	make
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
 }
 sha512sums="
-1c80b884d802fb573cf1cc52f955087cbc544ca7e308c6acbdba1a2fd0583c331f5ed6518a830a65fa6f8f9ddc4daa6ad067aa6fc3c76bfb669c0df3cb0f93af  mobile-config-firefox-3.0.0_rc1.tar.bz2
-b99713e30add88f532870430a3c9122faf7e932356cdbe1faa571b661088ce00665a5e499f1873688e58c014b741235571b67efa3df2228b5f3e39972d6f35e3  distro_links.html
+b93052c8047bc91cc7a12d4e33f035bf01f5357e0e09a46c4b0984ad750957da621407245859f96513c1623baeed7e2366285c69c85969572605dcd8c3074173  mobile-config-firefox-3.0.0.tar.bz2
 "

main/mobile-config-firefox/distro_links.html

-<p class="distro-links">
-	<a href="https://postmarketos.org/blog">blog</a> -
-	<a href="https://wiki.postmarketos.org/">wiki</a>
-</p>

main/msm-firmware-loader/APKBUILD

 pkgname=msm-firmware-loader
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Set of init services to automatically load firmware from device partitions"
 url="https://postmarketos.org/"
 subpackages="$pkgname-wcnss"
@@ -42,7 +42,7 @@ wcnss() {
 }
 
 sha512sums="
-ce6d8a072673bcdf6a3b24455d690291c87046802a460742271c2465db3326a09792b7c0c3e07d3e741b75cc34a5e416a64899153a0b920149e70718d0188761  msm-firmware-loader.sh
+e311f589c55670974f300f821a49baf54f4966ab5617dbaeef43389be013f1139490b8cfdc7ef4e3c59b6f0013ea1b2c50b37487c6d22104f8dc6d287c158fac  msm-firmware-loader.sh
 d9ad3b21564de9a4970a8923b8598fb46a54543ac9f1494676a6833800bc68c64f230737b308fec54aae09c2cf635794e8f1abc46253b0386260b4580587483d  msm-firmware-loader.initd
 93063f24b64206f4e6115ca0276d47bb65e1c510fc56fe1a939030d09d3b63cf07f001fb789309bb317f787cbe687906258bb5eb961a9ea90568f672378e86ea  msm-firmware-loader-unpack.sh
 616a28c3a65a45bb65f798989d93daacdeea08a90a9a8538b5bac2d73b2c8b135554ecaf49b4084829f88af760a144802adcd89b50f46bc267d6b04c9c733ff8  msm-firmware-loader-unpack.initd

main/msm-firmware-loader/msm-firmware-loader.sh

@@ -46,7 +46,7 @@ do
 	DEVNAME="$(grep DEVNAME "$part"/uevent | sed 's/DEVNAME=//g')"
 	PARTNAME="$(grep PARTNAME "$part"/uevent | sed 's/PARTNAME=//g')"
 
-	if [ -z "${FW_PARTITIONS##*$PARTNAME*}" ] && [ -n "$PARTNAME" ]
+	if [ -z "${FW_PARTITIONS##*"$PARTNAME"*}" ] && [ -n "$PARTNAME" ]
 	then
 		mkdir "$BASEDIR/mnt/$PARTNAME"
 		mount -o ro,nodev,noexec,nosuid \

main/sxmo-common/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Miles Alan <m@milesalan.com>
 pkgname=sxmo-common
 pkgver=1.6.0
-pkgrel=6
+pkgrel=8
 pkgdesc="Simple Mobile: Core package to build custom SXMO desktop environments"
 url="http://sr.ht/~mil/Sxmo"
 arch="noarch !armhf"

main/sxmo-common/sxmo-common.post-install

@@ -5,4 +5,3 @@ rc-update add sxmo-setpermissions default
 rc-update add modemmanager default
 rc-update add tinydm default
 rc-update add networkmanager default
-rc-update add polkit default

main/ttyescape/APKBUILD

 # Maintainer: Caleb Connolly <caleb@connolly.tech>
 pkgname=ttyescape
-pkgver=0.1
+pkgver=0.2
 pkgrel=0
 pkgdesc="Daemon to allow users to escape to a tty"
 url="https://postmarketos.org"
-arch="all"
+arch="noarch"
 license="GPL-3.0-or-later"
-depends="triggerhappy fbkeyboard terminus-font kbd"
+depends="hkdm buffyboard terminus-font kbd"
 install="$pkgname.post-install"
+subpackages="$pkgname-openrc"
 source="
 	togglevt.sh
-	ttyescape-triggerhappy.conf
+	ttyescape-hkdm.toml
 	etc-conf-d-ttyescape.conf
 "
 options="!check"
@@ -19,15 +20,15 @@ package() {
 	install -Dm755 "$srcdir"/togglevt.sh \
 		"$pkgdir"/usr/bin/togglevt.sh
 
-	install -Dm755 "$srcdir"/ttyescape-triggerhappy.conf \
-		"$pkgdir"/etc/triggerhappy/triggers.d/ttyescape.conf
+	install -Dm755 "$srcdir"/ttyescape-hkdm.toml \
+		"$pkgdir"/etc/hkdm/config.d/ttyescape.toml
 
 	install -Dm755 "$srcdir"/etc-conf-d-ttyescape.conf \
 		"$pkgdir"/etc/conf.d/ttyescape.conf
 }
 
 sha512sums="
-5a56740678073c72c1952e36742fb0786f932e718835c39502ab51f9731426e2b8479de38d4c44c35bc84a895b74ea0dc7bd39fd9eb89b603973ed6e43abb377  togglevt.sh
-f8bf3273cf87392ab2092a005417bc58cb3ae6ad25b9118b76c68481d9d8fc7d964a9d16fc7645f6f9ff0676dccd381be3b846464b2e60a6452b8c883bffb6f1  ttyescape-triggerhappy.conf
-5429c7029e6db292cccbd4d5fdb4eb07cbbe050fe886784ebb1f88d790de35c06714c2ad38d366d88ed78a09d4d20e0826541f8f578885384ff6b033ac606af8  etc-conf-d-ttyescape.conf
+d7447788044b76862688f4fbd722725a787f8fe07ef1d8fde34f01591e680dd782fd4085fd80166a695e0016162d4a8701e749ae4a56a9cf8ae388ab43ef72e1  togglevt.sh
+88034b54b06a962ff353a7a5a272352b56fdb564231a13be85b73d9dfc991d1ec8085014ebfcd5c6eaee67e62341dd2c9c7ace91a2c839702ae3b7f6007433f4  ttyescape-hkdm.toml
+ac06c2ae2b3b8404d6ed79a046b175abbeb2360033edcaa22c21e1a61c68913e58013e9200ee5b786eee9020a2c78d1bda09c72d87ea0998bf6eeb71da015a2f  etc-conf-d-ttyescape.conf
 "

main/ttyescape/etc-conf-d-ttyescape.conf

@@ -6,3 +6,4 @@ FONT="/usr/share/consolefonts/ter-128n.psf.gz"
 PRESSCOUNT=3
 # tmpfile to use for counting state
 TMPFILE="/tmp/ttyescape.tmp"
+KEYBOARD="buffyboard"

main/ttyescape/togglevt.sh

 #!/bin/sh
 
-# Toggle between tty1 and tty2, launching fbkeyboard when on tty2
+# Toggle between tty1 and tty2, launching $KEYBOARD when on tty2
 # THIS SCRIPT MUST BE RUN AS ROOT
 # usage:
 # togglevt.sh <state>
@@ -19,6 +19,7 @@ FONT="${FONT:-/usr/share/consolefonts/ter-128n.psf.gz}"
 # amount of times power must be pressed to trigger
 PRESSCOUNT="${PRESSCOUNT:-3}"
 TMPFILE="${TMPFILE:-/tmp/ttyescape.tmp}"
+KEYBOARD="${KEYBOARD:-buffyboard}"
 
 if [ ! -e /dev/uinput ]; then
 	if ! modprobe -q uinput; then
@@ -31,12 +32,12 @@ switchtty() {
 
 	if [ "$currentvt" = "tty2" ]; then # switch to tty1 with normal UI
 		chvt 1
-		killall fbkeyboard
-	else # Switch to tty2 with fbkeyboard
+		killall "$KEYBOARD"
+	else # Switch to tty2 with $KEYBOARD
 		setfont "$FONT" -C /dev/tty2
 		chvt 2
-		# sometimes fbkeyboard can be running already, we shouldn't start it in that case
-		[ "$(pgrep fbkeyboard)" ] || nohup fbkeyboard -r "$(cat /sys/class/graphics/fbcon/rotate)" &
+		# sometimes they keyboard can be running already, we shouldn't start it in that case
+		[ "$(pgrep "$KEYBOARD")" ] || nohup "$KEYBOARD" -r "$(cat /sys/class/graphics/fbcon/rotate)" &
 	fi
 }
 

main/ttyescape/ttyescape-hkdm.toml

+[[events]]
+name = "increment"
+event_type = "EV_KEY"
+key_state = "released"
+keys = ["KEY_VOLUMEDOWN", "KEY_POWER"]
+command = "/usr/bin/togglevt.sh inc"
+
+[[events]]
+name = "start"
+event_type = "EV_KEY"
+key_state = "pressed"
+keys = ["KEY_VOLUMEDOWN"]
+command = "/usr/bin/togglevt.sh start"
+
+[[events]]
+name = "reset"
+event_type = "EV_KEY"
+key_state = "released"
+keys = ["KEY_VOLUMEDOWN"]
+command = "/usr/bin/togglevt.sh reset"
\ No newline at end of file

main/ttyescape/ttyescape-triggerhappy.conf

-KEY_POWER+KEY_VOLUMEDOWN  0   /usr/bin/togglevt.sh inc
-KEY_VOLUMEDOWN            1   /usr/bin/togglevt.sh start
-KEY_VOLUMEDOWN            0   /usr/bin/togglevt.sh reset
-# noop to prevent garbage being typed in console
-KEY_VOLUMEDOWN            2   /bin/true

main/ttyescape/ttyescape.post-install

 #!/bin/sh
 
-# Enable triggerhappy
-rc-update -q add triggerhappy default
+# Enable hkdm
+rc-update -q add hkdm default