keymaps: drop kernel dependency

diff --git a/recipes/keymaps/files/keymap b/recipes/keymaps/files/keymap
index 6ebc634..5119ca3 100644 (file)
--- a/recipes/keymaps/files/keymap
+++ b/recipes/keymaps/files/keymap
@@ -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" )
 then
-       for extension in `ls -1 /etc/keymap-extension-$KERNEL_MAJMIN*` 
+       for extension in `ls -1 /etc/keymap-extension*` 
        do      
                loadkeys "$extension"
        done

diff --git a/recipes/keymaps/keymaps_1.0.bb b/recipes/keymaps/keymaps_1.0.bb
index d95da43..e0c97ec 100644 (file)
--- a/recipes/keymaps/keymaps_1.0.bb
+++ b/recipes/keymaps/keymaps_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 RDEPENDS_${PN} = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
-PR = "r25"
+PR = "r26"
 
 inherit update-rc.d