From cf09159e2fa9643af43c5455613dcc47ccca19e2 Mon Sep 17 00:00:00 2001
From: "Sicelo A. Mhlongo" <absicsz@gmail.com>
Date: Thu, 6 Aug 2026 19:11:06 +0200
Subject: [PATCH] device-blackberry-key2-generic: handle hwdb correctly

Comply with pmOS, which prefers to store hwdb in /etc. openrc works
differently, or at least the packaging in pmOS/Alpine does, so manually
recompile hwdb at package installation time in that case.

Fixes: a99f6804688c ("device-blackberry-key2-generic: additional unl0kr fixes")
Signed-off-by: Sicelo A. Mhlongo <absicsz@gmail.com>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/9335>
---
 .../device-blackberry-key2-generic/10-initfs-keymap.files | 2 +-
 device/testing/device-blackberry-key2-generic/APKBUILD    | 5 ++---
 .../device-blackberry-key2-generic.post-install           | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/device/testing/device-blackberry-key2-generic/10-initfs-keymap.files b/device/testing/device-blackberry-key2-generic/10-initfs-keymap.files
index 8ea6fbcc8..2a5c54ccc 100644
--- a/device/testing/device-blackberry-key2-generic/10-initfs-keymap.files
+++ b/device/testing/device-blackberry-key2-generic/10-initfs-keymap.files
@@ -1,3 +1,3 @@
-/usr/lib/udev/hwdb.bin
+/etc/udev/hwdb.bin
 /usr/share/bkeymaps/us/us-key2.bmap.gz
 /usr/share/unl0kr/unl0kr.conf.d/00-key2-keyboard.conf
diff --git a/device/testing/device-blackberry-key2-generic/APKBUILD b/device/testing/device-blackberry-key2-generic/APKBUILD
index 867c13487..de50598e5 100644
--- a/device/testing/device-blackberry-key2-generic/APKBUILD
+++ b/device/testing/device-blackberry-key2-generic/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Paul Sajna <sajattack@postmarketos.org>"
 pkgname=device-blackberry-key2-generic
 pkgdesc="BlackBerry KEY2"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -28,7 +28,6 @@ subpackages="
 	$pkgname-sway
 	$pkgname-x11
 "
-
 source="
 	10-initfs-keymap.sh
 	10-initfs-keymap.files
@@ -87,7 +86,7 @@ x11() {
 
 sha512sums="
 ab91ae3241d058edc507cd4551477e04918735bd2b56e193fac29daf7d5a3c6110eab7c4e92bdc4dad8e04519ad3187c8f16a92692367c869cdf50c87d56bb4b  10-initfs-keymap.sh
-662c2019a4edeedec0a863116504e7de075e45a002a9f945afa433a6d0221c505b13d5fb57ac16cfa350d8844b5888fab6fb65fc14af2faac7abb55d0556cc2e  10-initfs-keymap.files
+23d7e0cadb7817b6f86f6ab8563f80054bd1d431b6c766bdfb76f92f659865dc0e58eaada641ca6376b71951f71571eb1e67394507802ce645cb4930cd2cbebb  10-initfs-keymap.files
 e6fcccb182c10ba786e8929a784d233acd0eb745a6a8c87bff09e09194f397814d5969610a84f7dfcaaeebb86d0c1fddc261d0dd384705bcc75b6c37a8ec3272  40-xkb.conf
 50d45e83270089d66c4369da5582609284acf41d25306731084917bead61752921cb6aa284c6e19a017cfef514dd8b0184ede4cf50532941124db18acacc15fb  deviceinfo
 a8c557f5ed5a858c7ae5793ade5501181577b25033247a0ae855ee67b483075bd9972d2bc7edc3f167c4156db04c3ffbd2cbcd9e39322ac8a2012fba220a177b  etc-sway-config.d-key2.conf
diff --git a/device/testing/device-blackberry-key2-generic/device-blackberry-key2-generic.post-install b/device/testing/device-blackberry-key2-generic/device-blackberry-key2-generic.post-install
index ac2c3ff42..b8101913b 100644
--- a/device/testing/device-blackberry-key2-generic/device-blackberry-key2-generic.post-install
+++ b/device/testing/device-blackberry-key2-generic/device-blackberry-key2-generic.post-install
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-if command -v systemd-hwdb; then
-	systemd-hwdb --usr --update
-else
-	udevadm hwdb --usr --update
+# explicit recompilation of the hwdb only needed under openrc, since systemd
+# packaging ships a system-wide trigger based on files in /usr/lib/udev
+if ! command -v systemd-hwdb; then
+	udevadm hwdb --update
 fi
 exit 0