2 files changed, 56 insertions, 167 deletions
diff --git a/openembedded/packages/keymaps/files/poodle/keymap-2.6.map b/openembedded/packages/keymaps/files/poodle/keymap-2.6.map
index 9aca5abb38..68533bb93c 100644
--- a/openembedded/packages/keymaps/files/poodle/keymap-2.6.map
+++ b/openembedded/packages/keymaps/files/poodle/keymap-2.6.map
@@ -1,169 +1,58 @@
-# Note:
+keymaps 0-2,4,8,12
-# The way in which the modifiers are handled are quite different
-# than how they were handled in the 2.4.6-rmk1-np2-embedix kernel.
+#             Default           Shift           AltGr           Control         Alt             Ctrl+Alt        
-# 
+keycode  29 = SControl  # Calendar      
-# Here, we simply pass up Fn as Control, and the german accent key
+keycode  60 = SAlt      # Address
-# as Altgr, and simply use a proper keymap.  Said keymap is as
+keycode  63 = Return            
-# follows.
+keycode  68 = F13       # Mail
-# keymaps 0-2,4-5,8,12,20
+keycode  87 = Return            
-keycode   1 = Escape           Escape          
+keycode  88 = F11       # Menu
-keycode  14 = BackSpace
+keycode 102 = F12       # Home
-        shift   keycode  14 = BackSpace
+keycode 103 = Up                Up              Prior
-        control keycode  14 = Delete
+keycode 105 = Left              Left            Decr_Console    
-        shiftl  control keycode  14 = bracketleft
+keycode 106 = Right             Right           Incr_Console    
-        control shiftr  keycode  14 = bracketleft
+keycode 108 = Down              Down            Next
-keycode  15 = Tab              Tab             
+keycode 116 = Escape            
-        shift   keycode  15 = backslash
-        control keycode  15 = Caps_Lock
+keycode  14 = BackSpace         BackSpace       Delete
-        shiftl  control keycode  15 = Caps_Lock
+keycode  15 = Tab               backslash       Caps_Lock
-        control shiftr  keycode  15 = Caps_Lock
+keycode  28 = Return            Return          greater 
-keycode  16 = q               
+keycode  40 = apostrophe        quotedbl        tilde
-        control keycode  16 = one             
+keycode  42 = SShift            
-        shiftl  control keycode  16 = Control_q       
+keycode  51 = comma             semicolon       parenright
-        control shiftr  keycode  16 = Meta_q       
+keycode  52 = period            colon           less
-keycode  17 = w               
+keycode  53 = slash             question        Num_Lock
-        control keycode  17 = two       
+keycode  54 = SShift 
-        shiftl  control keycode  17 = Control_w       
+keycode  57 = space             bar             bar
-        control shiftr  keycode  17 = Meta_w       
+keycode  67 = SAltGr
-keycode  18 = e               
-        control keycode  18 = three       
+keycode  16 = +q                +Q              one             Control_q       Meta_q
-        shiftl  control keycode  18 = Control_e       
+keycode  17 = +w                +W              two             Control_w       Meta_w
-        control shiftr  keycode  18 = Meta_e       
+keycode  18 = +e                +E              three           Control_e       Meta_e
-keycode  19 = r               
+keycode  19 = +r                +R              four            Control_r       Meta_r
-        control keycode  19 = four       
+keycode  20 = +t                +T              five            Control_t       Meta_t
-        shiftr  control keycode  19 = Control_r       
+keycode  21 = +y                +Y              six             Control_y       Meta_y
-        control shiftl  keycode  19 = Meta_r       
+keycode  22 = +u                +U              seven           Control_u       Meta_u
-keycode  20 = t               
+keycode  23 = +i                +I              eight           Control_i       Meta_i
-        control keycode  20 = five       
+keycode  24 = +o                +O              nine            Control_o       Meta_o
-        shiftl  control keycode  20 = Control_t       
+keycode  25 = +p                +P              zero            Control_p       Meta_p
-        control shiftr  keycode  20 = Meta_t       
+keycode  30 = +a                +A              exclam          Control_a       Meta_a
-keycode  21 = y               
+keycode  31 = +s                +S              at              Control_s       Meta_s
-        control keycode  21 = six       
+keycode  32 = +d                +D              numbersign      Control_d       Meta_d
-        shiftl  control keycode  21 = Control_y       
+keycode  33 = +f                +F              dollar          Control_f       Meta_f
-        control shiftr  keycode  21 = Meta_y       
+keycode  34 = +g                +G              percent         Control_g       Meta_g
-keycode  22 = u               
+keycode  35 = +h                +H              underscore      Control_h       Meta_h
-        control keycode  22 = seven       
+keycode  36 = +j                +J              ampersand       Control_j       Meta_j
-        shiftl  control keycode  22 = Control_u       
+keycode  37 = +k                +K              asterisk        Control_k       Meta_k
-        control shiftr  keycode  22 = Meta_u       
+keycode  38 = +l                +L              parenleft       Control_l       Meta_l
-keycode  23 = i               
+keycode  44 = +z                +Z              VoidSymbol      Control_z       Meta_z
-        control keycode  23 = eight             
+keycode  45 = +x                +X              Control_x       Control_x       Meta_x
-        shiftl  control keycode  23 = Control_i             
+keycode  46 = +c                +C              Control_c       Control_c       Meta_c
-        control shiftr  keycode  23 = Meta_i             
+keycode  47 = +v                +V              Control_v       Control_v       Meta_v
-keycode  24 = o               
+keycode  48 = +b                +B              minus           Control_b       Meta_b
-        control keycode  24 = nine       
+keycode  49 = +n                +N              plus            Control_n       Meta_n
-        shiftl  control keycode  24 = Control_o       
+keycode  50 = +m                +M              equal           Control_m       Meta_m
-        control shiftr  keycode  24 = Meta_o       
+                
-keycode  25 = p               
-        control keycode  25 = zero       
-        shiftl  control keycode  25 = Control_p       
-        control shiftr  keycode  25 = Meta_p       
-keycode  28 = Return          
-        control keycode  28 = greater
-        shiftl  control keycode  28 = braceright
-        control shiftr  keycode  28 = braceright
-keycode  29 = Control         
-keycode  30 = a               
-        control keycode  30 = exclam       
-        shiftl  control keycode  30 = Control_a       
-        control shiftr  keycode  30 = Meta_a       
-keycode  31 = s               
-        control keycode  31 = at       
-        shiftl  control keycode  31 = Control_s       
-        control shiftr  keycode  31 = Meta_s       
-keycode  32 = d               
-        control keycode  32 = numbersign
-        shiftl  control keycode  32 = Control_d       
-        control shiftr  keycode  32 = Meta_d       
-keycode  33 = f               
-        control keycode  33 = dollar       
-        shiftl  control keycode  33 = Control_f       
-        control shiftr  keycode  33 = Meta_f       
-keycode  34 = g               
-        control keycode  34 = percent       
-        shiftl  control keycode  34 = Control_g       
-        control shiftr  keycode  34 = Meta_g       
-keycode  35 = h               
-        control keycode  35 = underscore       
-        shiftl  control keycode  35 = BackSpace       
-        control shiftr  keycode  35 = BackSpace       
-keycode  36 = j               
-        control keycode  36 = ampersand        
-        shiftl  control keycode  36 = Linefeed        
-        control shiftr  keycode  36 = Linefeed        
-keycode  37 = k               
-        control keycode  37 = asterisk       
-        shiftl  control keycode  37 = Control_k       
-        control shiftr  keycode  37 = Meta_k       
-keycode  38 = l               
-        control keycode  38 = bracketleft       
-        shiftl  control keycode  51 = parenleft
-        control shiftr  keycode  51 = parenleft
-keycode  40 = apostrophe       quotedbl
-        control keycode  40 = asciitilde       
-        shiftl  control keycode  40 = asciicircum
-        control shiftr  keycode  40 = asciicircum       
-keycode  42 = Shift           
-keycode  44 = z               
-        control keycode  44 = Control_z       
-        shiftl  control keycode  44 = Control_z       
-        control shiftr  keycode  44 = Meta_z       
-keycode  45 = x               
-        control keycode  45 = Control_x       
-        shiftl  control keycode  45 = Control_x       
-        control shiftr  keycode  45 = Meta_x       
-keycode  46 = c               
-        control keycode  46 = Control_c       
-        shiftl  control keycode  46 = Control_c       
-        control shiftr  keycode  46 = Meta_c       
-keycode  47 = v               
-        control keycode  47 = Control_v       
-        shiftl  control keycode  47 = Control_v       
-        control shiftr  keycode  47 = Meta_v       
-## current location ##
-keycode  48 = b               
-        control keycode  48 = minus       
-        shiftl  control keycode  48 = Control_b       
-        control shiftr  keycode  48 = Meta_b       
-keycode  49 = n               
-        control keycode  49 = plus       
-        shiftl  control keycode  49 = Control_n       
-        control shiftr  keycode  49 = Meta_n       
-keycode  50 = m               
-        control keycode  50 = equal       
-        shiftl  control keycode  50 = Control_m       
-        control shiftr  keycode  50 = Meta_m       
-keycode  51 = comma
-        shift   keycode  51 = semicolon
-        control keycode  51 = bracketright
-        shiftl  control keycode  51 = parenright
-        control shiftr  keycode  51 = parenright
-keycode  52 = period
-        shift   keycode  52 = colon
-        control keycode  52 = less
-        shiftl  control keycode  52 = braceleft
-        control shiftr  keycode  52 = braceleft
-keycode  53 = slash
-        shift   keycode  53 = question
-        control keycode  53 = Num_Lock
-        shiftl  control keycode  53 = Num_Lock
-        control shiftr  keycode  53 = Num_Lock
-keycode  54 = Shift           
-keycode  55 = KP_Multiply     
-keycode  56 = Alt             
-keycode  57 = space
-        shift   keycode  57 = bar
-        control keycode  57 = nul
-        shiftl  control keycode  57 = grave
-        control shiftr  keycode  57 = grave
-keycode  97 = Control         
-keycode  99 = Control_backslash
-        control keycode  99 = Control_backslash
-keycode 100 = AltGr           
-keycode 103 = Up              
-keycode 105 = Left            
-keycode 106 = Right           
-keycode 107 = Select          
-keycode 108 = Down            
 string F1 = "\033[[A"
 string F2 = "\033[[B"
 string F3 = "\033[[C"
diff --git a/openembedded/packages/keymaps/keymaps_1.0.bb b/openembedded/packages/keymaps/keymaps_1.0.bb
index 350a7e0e08..a906d7f383 100644
--- a/openembedded/packages/keymaps/keymaps_1.0.bb
+++ b/openembedded/packages/keymaps/keymaps_1.0.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 RDEPENDS = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
-PR = "r3"
+PR = "r5"
 inherit update-rc.d

diff --git a/openembedded/packages/keymaps/files/poodle/keymap-2.6.map b/openembedded/packages/keymaps/files/poodle/keymap-2.6.map index 9aca5abb38..68533bb93c 100644 --- a/openembedded/packages/keymaps/files/poodle/keymap-2.6.map +++ b/openembedded/packages/keymaps/files/poodle/keymap-2.6.map
@@ -1,169 +1,58 @@
1	# Note:	1	keymaps 0-2,4,8,12
2	# The way in which the modifiers are handled are quite different	2
3	# than how they were handled in the 2.4.6-rmk1-np2-embedix kernel.	3	# Default Shift AltGr Control Alt Ctrl+Alt
4	#	4	keycode 29 = SControl # Calendar
5	# Here, we simply pass up Fn as Control, and the german accent key	5	keycode 60 = SAlt # Address
6	# as Altgr, and simply use a proper keymap. Said keymap is as	6	keycode 63 = Return
7	# follows.	7	keycode 68 = F13 # Mail
8	# keymaps 0-2,4-5,8,12,20	8	keycode 87 = Return
9	keycode 1 = Escape Escape	9	keycode 88 = F11 # Menu
10	keycode 14 = BackSpace	10	keycode 102 = F12 # Home
11	shift keycode 14 = BackSpace	11	keycode 103 = Up Up Prior
12	control keycode 14 = Delete	12	keycode 105 = Left Left Decr_Console
13	shiftl control keycode 14 = bracketleft	13	keycode 106 = Right Right Incr_Console
14	control shiftr keycode 14 = bracketleft	14	keycode 108 = Down Down Next
15	keycode 15 = Tab Tab	15	keycode 116 = Escape
16	shift keycode 15 = backslash	16
17	control keycode 15 = Caps_Lock	17	keycode 14 = BackSpace BackSpace Delete
18	shiftl control keycode 15 = Caps_Lock	18	keycode 15 = Tab backslash Caps_Lock
19	control shiftr keycode 15 = Caps_Lock	19	keycode 28 = Return Return greater
20	keycode 16 = q	20	keycode 40 = apostrophe quotedbl tilde
21	control keycode 16 = one	21	keycode 42 = SShift
22	shiftl control keycode 16 = Control_q	22	keycode 51 = comma semicolon parenright
23	control shiftr keycode 16 = Meta_q	23	keycode 52 = period colon less
24	keycode 17 = w	24	keycode 53 = slash question Num_Lock
25	control keycode 17 = two	25	keycode 54 = SShift
26	shiftl control keycode 17 = Control_w	26	keycode 57 = space bar bar
27	control shiftr keycode 17 = Meta_w	27	keycode 67 = SAltGr
28	keycode 18 = e	28
29	control keycode 18 = three	29	keycode 16 = +q +Q one Control_q Meta_q
30	shiftl control keycode 18 = Control_e	30	keycode 17 = +w +W two Control_w Meta_w
31	control shiftr keycode 18 = Meta_e	31	keycode 18 = +e +E three Control_e Meta_e
32	keycode 19 = r	32	keycode 19 = +r +R four Control_r Meta_r
33	control keycode 19 = four	33	keycode 20 = +t +T five Control_t Meta_t
34	shiftr control keycode 19 = Control_r	34	keycode 21 = +y +Y six Control_y Meta_y
35	control shiftl keycode 19 = Meta_r	35	keycode 22 = +u +U seven Control_u Meta_u
36	keycode 20 = t	36	keycode 23 = +i +I eight Control_i Meta_i
37	control keycode 20 = five	37	keycode 24 = +o +O nine Control_o Meta_o
38	shiftl control keycode 20 = Control_t	38	keycode 25 = +p +P zero Control_p Meta_p
39	control shiftr keycode 20 = Meta_t	39	keycode 30 = +a +A exclam Control_a Meta_a
40	keycode 21 = y	40	keycode 31 = +s +S at Control_s Meta_s
41	control keycode 21 = six	41	keycode 32 = +d +D numbersign Control_d Meta_d
42	shiftl control keycode 21 = Control_y	42	keycode 33 = +f +F dollar Control_f Meta_f
43	control shiftr keycode 21 = Meta_y	43	keycode 34 = +g +G percent Control_g Meta_g
44	keycode 22 = u	44	keycode 35 = +h +H underscore Control_h Meta_h
45	control keycode 22 = seven	45	keycode 36 = +j +J ampersand Control_j Meta_j
46	shiftl control keycode 22 = Control_u	46	keycode 37 = +k +K asterisk Control_k Meta_k
47	control shiftr keycode 22 = Meta_u	47	keycode 38 = +l +L parenleft Control_l Meta_l
48	keycode 23 = i	48	keycode 44 = +z +Z VoidSymbol Control_z Meta_z
49	control keycode 23 = eight	49	keycode 45 = +x +X Control_x Control_x Meta_x
50	shiftl control keycode 23 = Control_i	50	keycode 46 = +c +C Control_c Control_c Meta_c
51	control shiftr keycode 23 = Meta_i	51	keycode 47 = +v +V Control_v Control_v Meta_v
52	keycode 24 = o	52	keycode 48 = +b +B minus Control_b Meta_b
53	control keycode 24 = nine	53	keycode 49 = +n +N plus Control_n Meta_n
54	shiftl control keycode 24 = Control_o	54	keycode 50 = +m +M equal Control_m Meta_m
55	control shiftr keycode 24 = Meta_o	55
56	keycode 25 = p
57	control keycode 25 = zero
58	shiftl control keycode 25 = Control_p
59	control shiftr keycode 25 = Meta_p
60	keycode 28 = Return
61	control keycode 28 = greater
62	shiftl control keycode 28 = braceright
63	control shiftr keycode 28 = braceright
64	keycode 29 = Control
65	keycode 30 = a
66	control keycode 30 = exclam
67	shiftl control keycode 30 = Control_a
68	control shiftr keycode 30 = Meta_a
69	keycode 31 = s
70	control keycode 31 = at
71	shiftl control keycode 31 = Control_s
72	control shiftr keycode 31 = Meta_s
73	keycode 32 = d
74	control keycode 32 = numbersign
75	shiftl control keycode 32 = Control_d
76	control shiftr keycode 32 = Meta_d
77	keycode 33 = f
78	control keycode 33 = dollar
79	shiftl control keycode 33 = Control_f
80	control shiftr keycode 33 = Meta_f
81	keycode 34 = g
82	control keycode 34 = percent
83	shiftl control keycode 34 = Control_g
84	control shiftr keycode 34 = Meta_g
85	keycode 35 = h
86	control keycode 35 = underscore
87	shiftl control keycode 35 = BackSpace
88	control shiftr keycode 35 = BackSpace
89	keycode 36 = j
90	control keycode 36 = ampersand
91	shiftl control keycode 36 = Linefeed
92	control shiftr keycode 36 = Linefeed
93	keycode 37 = k
94	control keycode 37 = asterisk
95	shiftl control keycode 37 = Control_k
96	control shiftr keycode 37 = Meta_k
97	keycode 38 = l
98	control keycode 38 = bracketleft
99	shiftl control keycode 51 = parenleft
100	control shiftr keycode 51 = parenleft
101	keycode 40 = apostrophe quotedbl
102	control keycode 40 = asciitilde
103	shiftl control keycode 40 = asciicircum
104	control shiftr keycode 40 = asciicircum
105	keycode 42 = Shift
106	keycode 44 = z
107	control keycode 44 = Control_z
108	shiftl control keycode 44 = Control_z
109	control shiftr keycode 44 = Meta_z
110	keycode 45 = x
111	control keycode 45 = Control_x
112	shiftl control keycode 45 = Control_x
113	control shiftr keycode 45 = Meta_x
114	keycode 46 = c
115	control keycode 46 = Control_c
116	shiftl control keycode 46 = Control_c
117	control shiftr keycode 46 = Meta_c
118	keycode 47 = v
119	control keycode 47 = Control_v
120	shiftl control keycode 47 = Control_v
121	control shiftr keycode 47 = Meta_v
122	## current location ##
123	keycode 48 = b
124	control keycode 48 = minus
125	shiftl control keycode 48 = Control_b
126	control shiftr keycode 48 = Meta_b
127	keycode 49 = n
128	control keycode 49 = plus
129	shiftl control keycode 49 = Control_n
130	control shiftr keycode 49 = Meta_n
131	keycode 50 = m
132	control keycode 50 = equal
133	shiftl control keycode 50 = Control_m
134	control shiftr keycode 50 = Meta_m
135	keycode 51 = comma
136	shift keycode 51 = semicolon
137	control keycode 51 = bracketright
138	shiftl control keycode 51 = parenright
139	control shiftr keycode 51 = parenright
140	keycode 52 = period
141	shift keycode 52 = colon
142	control keycode 52 = less
143	shiftl control keycode 52 = braceleft
144	control shiftr keycode 52 = braceleft
145	keycode 53 = slash
146	shift keycode 53 = question
147	control keycode 53 = Num_Lock
148	shiftl control keycode 53 = Num_Lock
149	control shiftr keycode 53 = Num_Lock
150	keycode 54 = Shift
151	keycode 55 = KP_Multiply
152	keycode 56 = Alt
153	keycode 57 = space
154	shift keycode 57 = bar
155	control keycode 57 = nul
156	shiftl control keycode 57 = grave
157	control shiftr keycode 57 = grave
158	keycode 97 = Control
159	keycode 99 = Control_backslash
160	control keycode 99 = Control_backslash
161	keycode 100 = AltGr
162	keycode 103 = Up
163	keycode 105 = Left
164	keycode 106 = Right
165	keycode 107 = Select
166	keycode 108 = Down
167	string F1 = "\033[[A"	56	string F1 = "\033[[A"
168	string F2 = "\033[[B"	57	string F2 = "\033[[B"
169	string F3 = "\033[[C"	58	string F3 = "\033[[C"


diff --git a/openembedded/packages/keymaps/keymaps_1.0.bb b/openembedded/packages/keymaps/keymaps_1.0.bb index 350a7e0e08..a906d7f383 100644 --- a/openembedded/packages/keymaps/keymaps_1.0.bb +++ b/openembedded/packages/keymaps/keymaps_1.0.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
4	RDEPENDS = "initscripts console-tools"	4	RDEPENDS = "initscripts console-tools"
5	LICENSE = "GPL"	5	LICENSE = "GPL"
6	PACKAGE_ARCH = "${MACHINE}"	6	PACKAGE_ARCH = "${MACHINE}"
7	PR = "r3"	7	PR = "r5"
8		8
9	inherit update-rc.d	9	inherit update-rc.d
10		10