diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-02-10 14:33:55 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-02-10 14:33:55 +0000 |
| commit | 5fb35ca11147ed30c619cf93e19331fd835f3da9 (patch) | |
| tree | 45f05442e8a91453bfea03a29fb3cb96f49d80e5 /openembedded/packages/initscripts/initscripts-1.0 | |
| parent | 42dfbb2a0223ba5d091f053ad5401ecce6446e41 (diff) | |
| download | openembedded-core-5fb35ca11147ed30c619cf93e19331fd835f3da9.tar.gz openembedded-core-5fb35ca11147ed30c619cf93e19331fd835f3da9.tar.bz2 openembedded-core-5fb35ca11147ed30c619cf93e19331fd835f3da9.tar.xz openembedded-core-5fb35ca11147ed30c619cf93e19331fd835f3da9.zip | |
Apply more chanegs from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@272 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/initscripts/initscripts-1.0')
5 files changed, 40 insertions, 32 deletions
diff --git a/openembedded/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map b/openembedded/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map index dc45e948d..e6339979e 100644 --- a/openembedded/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map +++ b/openembedded/packages/initscripts/initscripts-1.0/akita/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 Left Left Left Decr_Console 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 Right Right Right Incr_Console 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/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map b/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map index dc45e948d..e6339979e 100644 --- a/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map +++ b/openembedded/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 Left Left Left Decr_Console 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 Right Right Right Incr_Console 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/openembedded/packages/initscripts/initscripts-1.0/keymap b/openembedded/packages/initscripts/initscripts-1.0/keymap index 792a31d6d..6ebc63426 100755 --- a/openembedded/packages/initscripts/initscripts-1.0/keymap +++ b/openembedded/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/openembedded/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map b/openembedded/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map index dc45e948d..e6339979e 100644 --- a/openembedded/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map +++ b/openembedded/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 Left Left Left Decr_Console 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 Right Right Right Incr_Console 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/openembedded/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map b/openembedded/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map index 5f42a3db5..b27f21e32 100644 --- a/openembedded/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map +++ b/openembedded/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map @@ -97,7 +97,7 @@ keycode 91 = space keycode 92 = space control keycode 92 = nul keycode 93 = -keycode 94 = AltGr +keycode 94 = exclam keycode 95 = semicolon keycode 96 = colon keycode 97 = bracketright @@ -119,7 +119,7 @@ keycode 112 = Shift keycode 113 = keycode 114 = keycode 115 = -keycode 116 = +keycode 116 = underscore keycode 117 = Control keycode 118 = keycode 119 = |