* keymaps: Fix kernel version issue
@ 2013-03-17 22:51 Richard Purdie
0 siblings, 0 replies; only message in thread
From: Richard Purdie @ 2013-03-17 22:51 UTC (permalink / raw)
To: openembedded-core
The conditional code here was to switch between 2.4 and 2.6
kernels. Since we no longer support 2.4, we can hardcode
2.6 which ensures the correct keymap will be found.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-bsp/keymaps/files/keymap.sh b/meta/recipes-bsp/keymaps/files/keymap.sh
index 6ebc634..0e5eabc 100755
--- a/meta/recipes-bsp/keymaps/files/keymap.sh
+++ b/meta/recipes-bsp/keymaps/files/keymap.sh
@@ -2,14 +2,13 @@
#
# load keymap, if existing
-KERNEL_MAJMIN=`uname -r | cut -d '.' -f 1,2`
-if [ -e /etc/keymap-$KERNEL_MAJMIN.map ]; then
- loadkeys /etc/keymap-$KERNEL_MAJMIN.map
+if [ -e /etc/keymap-2.6.map ]; then
+ loadkeys /etc/keymap-2.6.map
fi
-if ( ls "/etc" | grep -q "keymap-extension-${KERNEL_MAJMIN}" )
+if ( ls "/etc" | grep -q "keymap-extension-2.6" )
then
- for extension in `ls -1 /etc/keymap-extension-$KERNEL_MAJMIN*`
+ for extension in `ls -1 /etc/keymap-extension-2.6*`
do
loadkeys "$extension"
done
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-03-17 23:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-17 22:51 keymaps: Fix kernel version issue Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox