From 11a9e9814827d1e46196acd30382d60e4b2b12c7 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Tue, 23 Oct 2012 23:45:08 +0300 Subject: [PATCH] keymaps: drop kernel dependency --- recipes/keymaps/files/keymap | 9 ++++----- recipes/keymaps/keymaps_1.0.bb | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/recipes/keymaps/files/keymap b/recipes/keymaps/files/keymap index 6ebc634266..5119ca373d 100644 --- 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 d95da4320b..e0c97ec6c3 100644 --- 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 -- 2.39.5