summaryrefslogtreecommitdiff
path: root/packages/initscripts
diff options
context:
space:
mode:
Diffstat (limited to 'packages/initscripts')
-rw-r--r--packages/initscripts/initscripts-1.0/akita/keymap-2.4.map4
-rw-r--r--packages/initscripts/initscripts-1.0/akita/keymap-extension-2.4-de.map8
-rw-r--r--packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map20
-rwxr-xr-xpackages/initscripts/initscripts-1.0/keymap8
-rw-r--r--packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map20
-rw-r--r--packages/initscripts/initscripts_1.0.bb2
6 files changed, 31 insertions, 31 deletions
diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map b/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
index c47137dda0..1aedc1dc9c 100644
--- a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
+++ b/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
@@ -33,10 +33,10 @@ keycode 31 = BackSpace BackSpace Delete BackSpace
keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock
keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 34 = Escape Escape Escape Escape Escape
-keycode 35 = Left Left Home Left Left
+keycode 35 = Left Left Decr_Console Left Left
keycode 36 = Up Up PageUp Up Up
keycode 37 = Down Down PageDown Down Down
-keycode 38 = Right Right End Right Right
+keycode 38 = Right Right Incr_Console Right Right
keycode 39 = Return Return Return Return Return
keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol Console_1
diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-extension-2.4-de.map b/packages/initscripts/initscripts-1.0/akita/keymap-extension-2.4-de.map
deleted file mode 100644
index 0a43c8d107..0000000000
--- a/packages/initscripts/initscripts-1.0/akita/keymap-extension-2.4-de.map
+++ /dev/null
@@ -1,8 +0,0 @@
-# German keymappings
-shift altgr keycode 1 = +Adiaeresis
-shift altgr keycode 15 = +Odiaeresis
-shift altgr keycode 21 = +Udiaeresis
-altgr keycode 1 = +adiaeresis
-altgr keycode 15 = +odiaeresis
-altgr keycode 21 = +udiaeresis
-altgr keycode 19 = ssharp
diff --git a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map b/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
index dc45e948df..1aedc1dc9c 100644
--- a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
+++ b/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
@@ -1,4 +1,4 @@
-keymaps 0-2,4-5
+keymaps 0-2,4-5,8
keycode 1 = +a +A +a Control_a Control_a
keycode 2 = +b +B underscore Control_b Control_b
keycode 3 = +c +C +c Control_c Control_c
@@ -33,17 +33,17 @@ keycode 31 = BackSpace BackSpace Delete BackSpace
keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock
keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 34 = Escape Escape Escape Escape Escape
-keycode 35 = Left Left Home Left Left
+keycode 35 = Left Left Decr_Console Left Left
keycode 36 = Up Up PageUp Up Up
keycode 37 = Down Down PageDown Down Down
-keycode 38 = Right Right End Right Right
+keycode 38 = Right Right Incr_Console Right Right
keycode 39 = Return Return Return Return Return
keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol
-keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol
-keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol
-keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol
-keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol
-keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol
+keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol Console_1
+keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol Console_2
+keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol Console_3
+keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol Console_4
+keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol Console_5
keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol
keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol
keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol
@@ -57,7 +57,7 @@ keycode 55 = at grave VoidSymbol VoidSymbol
keycode 56 = Control Control Control Control Control
keycode 57 = Alt Alt Alt Alt Alt
keycode 58 = Control Control Control Control Control
-keycode 59 = minus at VoidSymbol VoidSymbol VoidSymbol
+keycode 59 = minus VoidSymbol at VoidSymbol VoidSymbol
keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock
keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
@@ -67,7 +67,7 @@ keycode 65 = Tab Tab Caps_Lock Tab
keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
-keycode 69 = asciitilde VoidSymbol VoidSymbol VoidSymbol VoidSymbol
+keycode 69 = Alt VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1
keycode 72 = KP_2 KP_2 KP_2 KP_2 KP_2
diff --git a/packages/initscripts/initscripts-1.0/keymap b/packages/initscripts/initscripts-1.0/keymap
index 792a31d6da..6ebc634266 100755
--- a/packages/initscripts/initscripts-1.0/keymap
+++ b/packages/initscripts/initscripts-1.0/keymap
@@ -6,3 +6,11 @@ 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/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map b/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map
index dc45e948df..1aedc1dc9c 100644
--- a/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map
+++ b/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map
@@ -1,4 +1,4 @@
-keymaps 0-2,4-5
+keymaps 0-2,4-5,8
keycode 1 = +a +A +a Control_a Control_a
keycode 2 = +b +B underscore Control_b Control_b
keycode 3 = +c +C +c Control_c Control_c
@@ -33,17 +33,17 @@ keycode 31 = BackSpace BackSpace Delete BackSpace
keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock
keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 34 = Escape Escape Escape Escape Escape
-keycode 35 = Left Left Home Left Left
+keycode 35 = Left Left Decr_Console Left Left
keycode 36 = Up Up PageUp Up Up
keycode 37 = Down Down PageDown Down Down
-keycode 38 = Right Right End Right Right
+keycode 38 = Right Right Incr_Console Right Right
keycode 39 = Return Return Return Return Return
keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol
-keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol
-keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol
-keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol
-keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol
-keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol
+keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol Console_1
+keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol Console_2
+keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol Console_3
+keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol Console_4
+keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol Console_5
keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol
keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol
keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol
@@ -57,7 +57,7 @@ keycode 55 = at grave VoidSymbol VoidSymbol
keycode 56 = Control Control Control Control Control
keycode 57 = Alt Alt Alt Alt Alt
keycode 58 = Control Control Control Control Control
-keycode 59 = minus at VoidSymbol VoidSymbol VoidSymbol
+keycode 59 = minus VoidSymbol at VoidSymbol VoidSymbol
keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock
keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
@@ -67,7 +67,7 @@ keycode 65 = Tab Tab Caps_Lock Tab
keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
-keycode 69 = asciitilde VoidSymbol VoidSymbol VoidSymbol VoidSymbol
+keycode 69 = Alt VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1
keycode 72 = KP_2 KP_2 KP_2 KP_2 KP_2
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 4bdd918a59..18017d1e90 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
DEPENDS_openzaurus = "makedevs virtual/kernel"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r60"
+PR = "r63"
SRC_URI = "file://halt \
file://ramdisk \