Akita keymap:

- Map "Alt" to the japanese button to the right of "Ctrl"
- Allow changing of VTs with "Alt"+[1-5]
- Fix mapping of "@" to use "Fn", not "Shift" as indicated on the keyboard
- Add keymap-extension-2.4-de.map for german "umlauts" This file can be loaded in _addition_ to the normal keymap. I'll work out a way to package and use it. Currently it is _not_ packaged.

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 dc45e94..c47137d 100644 (file)
--- a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
+++ b/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       
@@ -39,11 +39,11 @@ keycode  37 = Down             Down             PageDown         Down
 keycode  38 = Right            Right            End              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/akita/keymap-extension-2.4-de.map b/packages/initscripts/initscripts-1.0/akita/keymap-extension-2.4-de.map
new file mode 100644 (file)
index 0000000..0a43c8d
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/akita/keymap-extension-2.4-de.map
@@ -0,0 +1,8 @@
+# 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.bb b/packages/initscripts/initscripts_1.0.bb
index c5332f2..4bdd918 100644 (file)
--- 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 = "r59"
+PR = "r60"
 
 SRC_URI = "file://halt \
            file://ramdisk \