Skip to contentSkip to conversation

keymaps: Fix kernel version issue

PATCH Richard Purdie 1 participant 1 message Mar 17, 2013

lore
Share & tools
lore
#0 lore raw

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.

---

meta/recipes-bsp/keymaps/files/keymap.sh +4 -5
index 6ebc634..0e5eabc 100755
@@ -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