From a243bf5df281c8e4680f36985e63cd12e226f63f Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Thu, 3 Jul 2008 10:46:56 +0000
Subject: keymaps: initscript can be sourced

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4797 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/keymaps/files/keymap    | 16 ----------------
 meta/packages/keymaps/files/keymap.sh | 16 ++++++++++++++++
 meta/packages/keymaps/keymaps_1.0.bb  |  8 ++++----
 3 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100755 meta/packages/keymaps/files/keymap
 create mode 100755 meta/packages/keymaps/files/keymap.sh

(limited to 'meta/packages/keymaps')

diff --git a/meta/packages/keymaps/files/keymap b/meta/packages/keymaps/files/keymap
deleted file mode 100755
index 6ebc63426..000000000
--- a/meta/packages/keymaps/files/keymap
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# 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
-fi
-
-if ( ls "/etc" | grep -q "keymap-extension-${KERNEL_MAJMIN}" )
-then
-	for extension in `ls -1 /etc/keymap-extension-$KERNEL_MAJMIN*` 
-	do	
-		loadkeys "$extension"
-	done
-fi
diff --git a/meta/packages/keymaps/files/keymap.sh b/meta/packages/keymaps/files/keymap.sh
new file mode 100755
index 000000000..6ebc63426
--- /dev/null
+++ b/meta/packages/keymaps/files/keymap.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# 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
+fi
+
+if ( ls "/etc" | grep -q "keymap-extension-${KERNEL_MAJMIN}" )
+then
+	for extension in `ls -1 /etc/keymap-extension-$KERNEL_MAJMIN*` 
+	do	
+		loadkeys "$extension"
+	done
+fi
diff --git a/meta/packages/keymaps/keymaps_1.0.bb b/meta/packages/keymaps/keymaps_1.0.bb
index 813ba4101..0f0f36a55 100644
--- a/meta/packages/keymaps/keymaps_1.0.bb
+++ b/meta/packages/keymaps/keymaps_1.0.bb
@@ -3,11 +3,11 @@ SECTION = "base"
 RDEPENDS = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
-PR = "r15"
+PR = "r16"
 
 inherit update-rc.d
 
-SRC_URI = "file://keymap"
+SRC_URI = "file://keymap.sh"
 
 SRC_URI_append_c7x0         = " file://keymap-*.map"
 SRC_URI_append_tosa         = " file://keymap-*.map"
@@ -19,12 +19,12 @@ SRC_URI_append_jornada6xx   = " file://keymap-*.map"
 SRC_URI_append_h2200        = " file://keymap-*.map"
 SRC_URI_append_htcuniversal = " file://keymap-*.map"
 
-INITSCRIPT_NAME = "keymap"
+INITSCRIPT_NAME = "keymap.sh"
 INITSCRIPT_PARAMS = "start 01 S ."
 
 do_install () {
     install -d ${D}${sysconfdir}/init.d/
-    install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/
+    install -m 0755 ${WORKDIR}/keymap.sh ${D}${sysconfdir}/init.d/
 
     case ${MACHINE} in
         c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200 | htcuniversal )
-- 
cgit v1.2.3