From 6ba36d0612686326487e605f82c32e3a4820be12 Mon Sep 17 00:00:00 2001
From: David Derby <dderby@users.noreply.github.com>
Date: Thu, 1 Mar 2018 22:33:03 -0500
Subject: [PATCH] Fix XKB keyboard layout.  Resolves maemo-leste/bugtracker#60

---
 extra/n900/etc/default/keyboard               | 10 ++++++++++
 extra/n900/etc/profile.d/nokia-n900-keymap.sh |  4 ----
 extra/n900/usr/share/keymaps/.keep            |  0
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 extra/n900/etc/default/keyboard
 delete mode 100644 extra/n900/etc/profile.d/nokia-n900-keymap.sh
 delete mode 100644 extra/n900/usr/share/keymaps/.keep

diff --git a/extra/n900/etc/default/keyboard b/extra/n900/etc/default/keyboard
new file mode 100644
index 0000000..109c025
--- /dev/null
+++ b/extra/n900/etc/default/keyboard
@@ -0,0 +1,10 @@
+# KEYBOARD CONFIGURATION FILE
+
+# Consult the keyboard(5) manual page.
+
+XKBMODEL="nokiarx51"
+XKBLAYOUT="us"
+XKBVARIANT=""
+XKBOPTIONS=""
+
+BACKSPACE="guess"
diff --git a/extra/n900/etc/profile.d/nokia-n900-keymap.sh b/extra/n900/etc/profile.d/nokia-n900-keymap.sh
deleted file mode 100644
index 625eebd..0000000
--- a/extra/n900/etc/profile.d/nokia-n900-keymap.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Setup Nokia N900 keymap either on console.
-if ! [ -n "$DISPLAY" ]; then
-	/bin/busybox loadkmap < /etc/nokia-n900.kmap
-fi
diff --git a/extra/n900/usr/share/keymaps/.keep b/extra/n900/usr/share/keymaps/.keep
deleted file mode 100644
index e69de29..0000000