Fixes for "Move post-install scripts to openrc subpackages": fajita, cros

Fix some minor (given the size of the MR) fallout from !5688 (merged).

This should fix most of the failed packages on bpo. See commit messages for details.

Fix #3290 (closed)

Fix:

ERROR: unable to select packages:
  postmarketos-cros-keymap (no such package):

(If @craftyguy or @lucaweiss merges this, can you reset the image status back to queued? but anyone else could merge it as well.)

device/community/device-oneplus-fajita/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
 pkgver=14
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -51,7 +51,6 @@ nonfree_firmware() {
 		soc-qcom-sdm845-nonfree-firmware
 		soc-qcom-sdm845-modem
 	"
-	replaces="hexagonrpcd-openrc"
 
 	install -Dm644 "$srcdir"/81-libssc-oneplus-fajita.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
 }
@@ -59,6 +58,7 @@ nonfree_firmware() {
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	replaces="hexagonrpcd-openrc"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp