merge of d23fa20efa477539bb55a99c02a96896167f1c2b

     and d974b2fdc2202ed227cf57f941cdb0b45b03cf15

7 files changed, 136 insertions, 8 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 1da58a924e..37254b94ba 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -187,7 +187,7 @@ oe_libinstall() {
 		__runcmd install -m 0644 $dota $destpath/
 	fi
 	dotlai=$libname.lai
-	if [ -f "$dotlai" -o -n "$libtool" ]; then
+	if [ -f "$dotlai" -a -n "$libtool" ]; then
 		__runcmd install -m 0644 $dotlai $destpath/$libname.la
 	fi
 
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index a095f15cdf..37dd0a52f2 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -5,7 +5,7 @@
 KERNEL ?= "kernel24"
 #KERNEL ?= "kernel26"
 
-OVERRIDES_prepend = "${KERNEL}:"
+OVERRIDES := "${KERNEL}:${OVERRIDES}"
 
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ipaqpxa h3900"
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index c860ea414d..9470fe009c 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -5,7 +5,7 @@
 KERNEL ?= "kernel24"
 #KERNEL ?= "kernel26"
 
-OVERRIDES_prepend = "${KERNEL}:"
+OVERRIDES := "${KERNEL}:${OVERRIDES}"
 
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ipaqpxa h3900"
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf
index 3ce5924d04..7b6761b250 100644
--- a/conf/machine/zaurus-clamshell-2.6.conf
+++ b/conf/machine/zaurus-clamshell-2.6.conf
@@ -27,8 +27,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-
 # Infrared Modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \
                              kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
-# PPP Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async"
 
 #USB Gadget Modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \
diff --git a/packages/initscripts/initscripts-1.0/akita/keymap b/packages/initscripts/initscripts-1.0/akita/keymap
new file mode 100755
index 0000000000..641a3a938d
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/akita/keymap
@@ -0,0 +1,2 @@
+#!/bin/sh
+loadkeys /etc/akitakeymap.map
diff --git a/packages/initscripts/initscripts-1.0/akitakeymap.map b/packages/initscripts/initscripts-1.0/akitakeymap.map
new file mode 100644
index 0000000000..7efbccedd8
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/akitakeymap.map
@@ -0,0 +1,128 @@
+keymaps 0-2,4-5
+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       
+keycode   4 = +d                +D                +d                Control_d        Control_d       
+keycode   5 = +e                +E                equal            Control_e        Control_e       
+keycode   6 = +f                +F                backslash        Control_f        Control_f       
+keycode   7 = +g                +G                semicolon        Control_g        Control_g       
+keycode   8 = +h                +H                colon            BackSpace        BackSpace       
+keycode   9 = +i                +I                +i                Tab              Tab             
+keycode  10 = +j                +J                asterisk         Linefeed         Linefeed        
+keycode  11 = +k                +K                backslash        Control_k        Control_k       
+keycode  12 = +l                +L                bar              Control_l        Control_l       
+keycode  13 = +m                +M                +m                Control_m        Control_m       
+keycode  14 = +n                +N                +n                Control_n        Control_n       
+keycode  15 = +o                +O                +o                Control_o        Control_o       
+keycode  16 = +p                +P                +p                Control_p        Control_p       
+keycode  17 = +q                +Q                +q                Control_q        Control_q       
+keycode  18 = +r                +R                plus             Control_r        Control_r       
+keycode  19 = +s                +S                +s                Control_s        Control_s       
+keycode  20 = +t                +T                bracketleft      Control_t        Control_t       
+keycode  21 = +u                +U                +u                Control_u        Control_u       
+keycode  22 = +v                +V                +v                Control_v        Control_v       
+keycode  23 = +w                +W                asciicircum      Control_w        Control_w       
+keycode  24 = +x                +X                +x                Control_x        Control_x       
+keycode  25 = +y                +Y                bracketright     Control_y        Control_y       
+keycode  26 = +z                +Z                +z                Control_z        Control_z       
+keycode  27 = Shift            Shift            Shift            Shift            Shift           
+keycode  28 = Return           Return           Return           Return           Return          
+keycode  29 = F11              F11              F11              F11              F11             
+keycode  30 = AltGr            AltGr            AltGr            AltGr            AltGr           
+keycode  31 = BackSpace        BackSpace        Delete           BackSpace        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  36 = Up               Up               PageUp           Up               Up              
+keycode  37 = Down             Down             PageDown         Down             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  46 = six              ampersand        VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  47 = seven            apostrophe       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  48 = eight            parenleft        VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  49 = nine             parenright       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  50 = zero             asciitilde       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  51 = minus            equal            VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  52 = asciicircum      asciitilde       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  53 = backslash        bar              VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  54 = bracketleft      braceleft        VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  55 = at               grave            VoidSymbol       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  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      
+keycode  63 = comma            slash            less             VoidSymbol       VoidSymbol      
+keycode  64 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  65 = Tab              Tab              Caps_Lock        Tab              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  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            
+keycode  73 = KP_3             KP_3             KP_3             KP_3             KP_3            
+keycode  74 = KP_4             KP_4             KP_4             KP_4             KP_4            
+keycode  75 = KP_5             KP_5             KP_5             KP_5             KP_5            
+keycode  76 = KP_6             KP_6             KP_6             KP_6             KP_6            
+keycode  77 = KP_7             KP_7             KP_7             KP_7             KP_7            
+keycode  78 = KP_8             KP_8             KP_8             KP_8             KP_8            
+keycode  79 = KP_9             KP_9             KP_9             KP_9             KP_9            
+keycode  80 = KP_0             KP_0             KP_0             KP_0             KP_0            
+keycode  81 = Delete           Delete           Delete           Delete           Delete          
+keycode  82 = KP_Divide        KP_Divide        KP_Divide        KP_Divide        KP_Divide       
+keycode  83 = KP_Multiply      KP_Multiply      KP_Multiply      KP_Multiply      KP_Multiply     
+keycode  84 = Return           Return           Return           Return           Return          
+keycode  85 = KP_Subtract      KP_Subtract      KP_Subtract      KP_Subtract      KP_Subtract     
+keycode  86 = KP_Add           KP_Add           KP_Add           KP_Add           KP_Add          
+keycode  87 = KP_Enter         KP_Enter         KP_Enter         KP_Enter         KP_Enter        
+keycode  88 = F9               F9               F9               F9               F9              
+keycode  89 = F10              F10              F10              F10              F10             
+keycode  90 = F13              F13              F13              F13              F13             
+keycode  91 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  92 = space            space            space            space            space           
+keycode  93 = KP_Period        KP_Period        KP_Period        KP_Period        KP_Period       
+keycode  94 = Escape           Escape           Escape           Escape
+keycode  95 = semicolon        plus             VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  96 = colon            asterisk         VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  97 = bracketright     braceright       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  98 = comma            less             VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  99 = period           greater          VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 100 = slash            question         VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 101 = underscore       underscore       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 102 = F15	       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 103 = period           question         greater          VoidSymbol       VoidSymbol      
+keycode 104 = Find             Find             Find             Find             Find            
+keycode 105 = Select           Select           Select           Select           Select          
+keycode 106 = Prior            Scroll_Backward  Prior            Prior            Prior           
+keycode 107 = Next             Scroll_Forward   Next             Next             Next            
+keycode 108 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 109 = F31	       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 110 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 111 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 112 = Shift            Shift            Shift            Shift            Shift      
+keycode 113 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 114 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 115 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 116 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 117 = Control          Control          Control          Control          Control         
+keycode 118 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 119 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 120 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 121 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 122 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 123 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 124 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode 125 = Up               Up               Up               Up
+keycode 126 = Down             Down             Down             Down
+keycode 127 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0
index 8e4712da4f..b6b7cbc17d 100644
--- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0
@@ -724,13 +724,13 @@ CONFIG_PCMCIA_PCNET=m
 # Wan interfaces
 #
 # CONFIG_WAN is not set
-CONFIG_PPP=m
+CONFIG_PPP=y
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=m
+CONFIG_PPP_ASYNC=y
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_BSDCOMP=y
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
 # CONFIG_SLIP is not set