From a99f6804688c13ba3db719c0462c5f1de72efcbd Mon Sep 17 00:00:00 2001
From: "Sicelo A. Mhlongo" <absicsz@gmail.com>
Date: Sat, 11 Jul 2026 23:48:02 +0200
Subject: [PATCH] device-blackberry-key2-generic: additional unl0kr fixes

* Apply keyboard layout to unl0kr
* Correctly add required files in initramfs

Signed-off-By: Sicelo A. Mhlongo <absicsz@gmail.com>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/9023>
---
 .../10-initfs-keymap.files                             |  2 ++
 device/testing/device-blackberry-key2-generic/APKBUILD | 10 +++++++---
 .../device-blackberry-key2-generic.post-install        |  8 ++++++++
 ...sr-share-unl0kr-unl0kr.conf.d-00-key2-keyboard.conf |  3 +++
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 device/testing/device-blackberry-key2-generic/device-blackberry-key2-generic.post-install
 create mode 100644 device/testing/device-blackberry-key2-generic/usr-share-unl0kr-unl0kr.conf.d-00-key2-keyboard.conf

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 b877db832..8ea6fbcc8 100644
--- a/device/testing/device-blackberry-key2-generic/10-initfs-keymap.files
+++ b/device/testing/device-blackberry-key2-generic/10-initfs-keymap.files
@@ -1 +1,3 @@
+/usr/lib/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 5826c7fd6..867c13487 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=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -23,7 +23,7 @@ makedepends="
 	devicepkg-dev
 	kbd
 "
-
+install="$pkgname.post-install"
 subpackages="
 	$pkgname-sway
 	$pkgname-x11
@@ -39,6 +39,7 @@ source="
 	keypad.conf
 	modules-initfs
 	usr-lib-udev-hwdb.d-99-key2-hwkb.hwdb
+	usr-share-unl0kr-unl0kr.conf.d-00-key2-keyboard.conf
 "
 
 build() {
@@ -68,6 +69,8 @@ package() {
 		"$pkgdir"/usr/lib/modules-load.d/keypad.conf
 	install -Dm644 "$srcdir"/usr-lib-udev-hwdb.d-99-key2-hwkb.hwdb \
 		"$pkgdir"/usr/lib/udev/hwdb.d/99-key2-hwkb.hwdb
+	install -Dm644 "$srcdir"/usr-share-unl0kr-unl0kr.conf.d-00-key2-keyboard.conf \
+		"$pkgdir"/usr/share/unl0kr/unl0kr.conf.d/00-key2-keyboard.conf
 }
 
 sway() {
@@ -84,7 +87,7 @@ x11() {
 
 sha512sums="
 ab91ae3241d058edc507cd4551477e04918735bd2b56e193fac29daf7d5a3c6110eab7c4e92bdc4dad8e04519ad3187c8f16a92692367c869cdf50c87d56bb4b  10-initfs-keymap.sh
-2edc79d25b71ab931113d9fac9ff244123e540b7faedae64ecefa987f16f9c30d4a891993c68c792b8d28c8ef41d62d50871b37cda46c03b68eb2a4609be0880  10-initfs-keymap.files
+662c2019a4edeedec0a863116504e7de075e45a002a9f945afa433a6d0221c505b13d5fb57ac16cfa350d8844b5888fab6fb65fc14af2faac7abb55d0556cc2e  10-initfs-keymap.files
 e6fcccb182c10ba786e8929a784d233acd0eb745a6a8c87bff09e09194f397814d5969610a84f7dfcaaeebb86d0c1fddc261d0dd384705bcc75b6c37a8ec3272  40-xkb.conf
 50d45e83270089d66c4369da5582609284acf41d25306731084917bead61752921cb6aa284c6e19a017cfef514dd8b0184ede4cf50532941124db18acacc15fb  deviceinfo
 a8c557f5ed5a858c7ae5793ade5501181577b25033247a0ae855ee67b483075bd9972d2bc7edc3f167c4156db04c3ffbd2cbcd9e39322ac8a2012fba220a177b  etc-sway-config.d-key2.conf
@@ -92,4 +95,5 @@ a8c557f5ed5a858c7ae5793ade5501181577b25033247a0ae855ee67b483075bd9972d2bc7edc3f1
 eadabfc07e465ce7acdd11428fb86b7c8dc5210779c7511b3e6dbe325332a1402f847392401172940cf23c4aab670629e47c6b67dbd76c8cdba9495cd9000ddb  keypad.conf
 b72b5cfa1fdd7597bf1765556688f505f31db24e650f6f95a4f0ebddd7ac091e32a31a3f3eb324243cd48fd5d7e7f866e0eac1a2a27f238078e492eb6c106470  modules-initfs
 4bbdfc6759e14023cdf494c318920ceb861251254044a48bd044c89f9f7f671a52b56efb17a58de2e891291a5145f67ee0746a90bc650dfb4aa486f1f1e81854  usr-lib-udev-hwdb.d-99-key2-hwkb.hwdb
+877ff63be647cfd88efc210a56ab5f2b5e3c3daadbe860497f3ca19471a10cc1d13567c201fd03ecf480c2c499b784a433f85c07eb5b393e1691307b536cdb6b  usr-share-unl0kr-unl0kr.conf.d-00-key2-keyboard.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
new file mode 100644
index 000000000..ac2c3ff42
--- /dev/null
+++ b/device/testing/device-blackberry-key2-generic/device-blackberry-key2-generic.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if command -v systemd-hwdb; then
+	systemd-hwdb --usr --update
+else
+	udevadm hwdb --usr --update
+fi
+exit 0
diff --git a/device/testing/device-blackberry-key2-generic/usr-share-unl0kr-unl0kr.conf.d-00-key2-keyboard.conf b/device/testing/device-blackberry-key2-generic/usr-share-unl0kr-unl0kr.conf.d-00-key2-keyboard.conf
new file mode 100644
index 000000000..cd330879d
--- /dev/null
+++ b/device/testing/device-blackberry-key2-generic/usr-share-unl0kr-unl0kr.conf.d-00-key2-keyboard.conf
@@ -0,0 +1,3 @@
+[hardware keyboard]
+model=blackberry-key2
+layout=us