propagate from branch 'org.openembedded.dev' (head a09cb27506f56d7b4d048f4d60c7df2e11968692)

            to branch 'org.openembedded.nslu2-linux' (head 145ec84e58e7acefd29711cc2431b9809b8804e9)

4 files changed, 223 insertions, 91 deletions

diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
index 5b576ecc93..85a194b850 100644..100755
--- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
+++ b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
@@ -108,11 +108,13 @@ keycode 88 = F11
 keycode 97 = Control  
 keycode 99 = F12       
 keycode 103 = Up              
+	altgr     keycode 103 = PageUp
 keycode 105 = Left            
 	altgr     keycode 105 = Decr_Console
 keycode 106 = Right           
 	altgr     keycode 106 = Incr_Console
 keycode 108 = Down  
+	altgr     keycode 108 = PageDown
 string F1 = "\033[[A"
 string F2 = "\033[[B"
 string F3 = "\033[[C"
@@ -141,71 +143,71 @@ string Prior = "\033[5~"
 string Next = "\033[6~"
 string Macro = "\033[M"
 string Pause = "\033[P"
-compose '`' 'A' to 'À'
-compose '`' 'a' to 'à'
-compose '\'' 'A' to 'Á'
-compose '\'' 'a' to 'á'
-compose '^' 'A' to 'Â'
-compose '^' 'a' to 'â'
-compose '~' 'A' to 'Ã'
-compose '~' 'a' to 'ã'
-compose '"' 'A' to 'Ä'
-compose '"' 'a' to 'ä'
-compose 'O' 'A' to 'Å'
-compose 'o' 'a' to 'å'
-compose '0' 'A' to 'Å'
-compose '0' 'a' to 'å'
-compose 'A' 'A' to 'Å'
-compose 'a' 'a' to 'å'
-compose 'A' 'E' to 'Æ'
-compose 'a' 'e' to 'æ'
-compose ',' 'C' to 'Ç'
-compose ',' 'c' to 'ç'
-compose '`' 'E' to 'È'
-compose '`' 'e' to 'è'
-compose '\'' 'E' to 'É'
-compose '\'' 'e' to 'é'
-compose '^' 'E' to 'Ê'
-compose '^' 'e' to 'ê'
-compose '"' 'E' to 'Ë'
-compose '"' 'e' to 'ë'
-compose '`' 'I' to 'Ì'
-compose '`' 'i' to 'ì'
-compose '\'' 'I' to 'Í'
-compose '\'' 'i' to 'í'
-compose '^' 'I' to 'Î'
-compose '^' 'i' to 'î'
-compose '"' 'I' to 'Ï'
-compose '"' 'i' to 'ï'
-compose '-' 'D' to 'Ð'
-compose '-' 'd' to 'ð'
-compose '~' 'N' to 'Ñ'
-compose '~' 'n' to 'ñ'
-compose '`' 'O' to 'Ò'
-compose '`' 'o' to 'ò'
-compose '\'' 'O' to 'Ó'
-compose '\'' 'o' to 'ó'
-compose '^' 'O' to 'Ô'
-compose '^' 'o' to 'ô'
-compose '~' 'O' to 'Õ'
-compose '~' 'o' to 'õ'
-compose '"' 'O' to 'Ö'
-compose '"' 'o' to 'ö'
-compose '/' 'O' to 'Ø'
-compose '/' 'o' to 'ø'
-compose '`' 'U' to 'Ù'
-compose '`' 'u' to 'ù'
-compose '\'' 'U' to 'Ú'
-compose '\'' 'u' to 'ú'
-compose '^' 'U' to 'Û'
-compose '^' 'u' to 'û'
-compose '"' 'U' to 'Ü'
-compose '"' 'u' to 'ü'
-compose '\'' 'Y' to 'Ý'
-compose '\'' 'y' to 'ý'
-compose 'T' 'H' to 'Þ'
-compose 't' 'h' to 'þ'
-compose 's' 's' to 'ß'
-compose '"' 'y' to 'ÿ'
-compose 's' 'z' to 'ß'
-compose 'i' 'j' to 'ÿ'
+compose '`' 'A' to '�
+compose '`' 'a' to '�
+compose '\'' 'A' to '�
+compose '\'' 'a' to '�
+compose '^' 'A' to '�
+compose '^' 'a' to '�
+compose '~' 'A' to '�
+compose '~' 'a' to '�
+compose '"' 'A' to '�
+compose '"' 'a' to '�
+compose 'O' 'A' to '�
+compose 'o' 'a' to '�
+compose '0' 'A' to '�
+compose '0' 'a' to '�
+compose 'A' 'A' to '�
+compose 'a' 'a' to '�
+compose 'A' 'E' to '�
+compose 'a' 'e' to '�
+compose ',' 'C' to '�
+compose ',' 'c' to '�
+compose '`' 'E' to '�
+compose '`' 'e' to '�
+compose '\'' 'E' to '�
+compose '\'' 'e' to '�
+compose '^' 'E' to '�
+compose '^' 'e' to '�
+compose '"' 'E' to '�
+compose '"' 'e' to '�
+compose '`' 'I' to '�
+compose '`' 'i' to '�
+compose '\'' 'I' to '�
+compose '\'' 'i' to '�
+compose '^' 'I' to '�
+compose '^' 'i' to '�
+compose '"' 'I' to '�
+compose '"' 'i' to '�
+compose '-' 'D' to '�
+compose '-' 'd' to '�
+compose '~' 'N' to '�
+compose '~' 'n' to '�
+compose '`' 'O' to '�
+compose '`' 'o' to '�
+compose '\'' 'O' to '�
+compose '\'' 'o' to '�
+compose '^' 'O' to '�
+compose '^' 'o' to '�
+compose '~' 'O' to '�
+compose '~' 'o' to '�
+compose '"' 'O' to '�
+compose '"' 'o' to '�
+compose '/' 'O' to '�
+compose '/' 'o' to ''
+compose '`' 'U' to '�
+compose '`' 'u' to ''
+compose '\'' 'U' to '�
+compose '\'' 'u' to ''
+compose '^' 'U' to '�
+compose '^' 'u' to ''
+compose '"' 'U' to '�
+compose '"' 'u' to ''
+compose '\'' 'Y' to '�
+compose '\'' 'y' to ''
+compose 'T' 'H' to '�
+compose 't' 'h' to ''
+compose 's' 's' to '�
+compose '"' 'y' to ''
+compose 's' 'z' to '�
+compose 'i' 'j' to ''
diff --git a/packages/initscripts/initscripts-1.0/keymap b/packages/initscripts/initscripts-1.0/keymap
index 792a31d6da..792a31d6da 100644..100755
--- a/packages/initscripts/initscripts-1.0/keymap
+++ b/packages/initscripts/initscripts-1.0/keymap
diff --git a/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map b/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map
new file mode 100644
index 0000000000..4a6bca982d
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map
@@ -0,0 +1,131 @@
+keymaps 0-1,4-5
+alt_is_meta
+keycode   1 = a               
+keycode   2 = b               
+keycode   3 = c               
+keycode   4 = d               
+keycode   5 = e               
+keycode   6 = f               
+keycode   7 = g               
+keycode   8 = h               
+keycode   9 = i               
+keycode  10 = j               
+keycode  11 = k               
+keycode  12 = l               
+keycode  13 = m               
+keycode  14 = n               
+keycode  15 = o               
+keycode  16 = p               
+keycode  17 = q               
+keycode  18 = r               
+keycode  19 = s               
+keycode  20 = t               
+keycode  21 = u               
+keycode  22 = v               
+keycode  23 = w               
+keycode  24 = x               
+keycode  25 = y               
+keycode  26 = z               
+keycode  27 = Shift           
+keycode  28 = Return          
+keycode  29 = F11              
+keycode  30 = AltGr
+keycode  31 = BackSpace       
+keycode  32 = bar             
+keycode  33 = F15 
+keycode  34 = Escape          
+keycode  35 = Left            
+keycode  36 = Up              
+keycode  37 = Down            
+keycode  38 = Right           
+keycode  39 = Return          
+keycode  40 = F12
+keycode  41 = one             
+keycode  42 = two             
+keycode  43 = three           
+keycode  44 = four            
+keycode  45 = five            
+keycode  46 = six             
+keycode  47 = seven           
+keycode  48 = eight           
+keycode  49 = nine            
+keycode  50 = zero            
+keycode  51 = +adiaeresis      
+keycode  52 = +udiaeresis      
+keycode  53 = +odiaeresis      
+keycode  54 = +Adiaeresis      
+keycode  55 = +Udiaeresis      
+keycode  56 = +Odiaeresis      
+keycode  57 = +ssharp          
+keycode  58 = minus           
+keycode  59 = plus            
+keycode  60 = Shift_Lock      
+keycode  61 = at              
+keycode  62 = question        
+keycode  63 = comma           
+keycode  64 = period          
+keycode  65 = Tab             
+keycode  66 = F5              
+keycode  67 = F6              
+keycode  68 = F7              
+keycode  69 = slash           
+keycode  70 = apostrophe      
+keycode  71 = semicolon       
+keycode  72 = quotedbl        
+keycode  73 = colon           
+keycode  74 = numbersign      
+keycode  75 = dollar          
+keycode  76 = percent         
+keycode  77 = underscore      
+keycode  78 = ampersand       
+keycode  79 = asterisk        
+keycode  80 = parenleft       
+keycode  81 = Delete          
+keycode  82 = F10             
+keycode  83 = equal           
+keycode  84 = parenright      
+keycode  85 = asciitilde      
+keycode  86 = less            
+keycode  87 = greater         
+keycode  88 = F9              
+keycode  89 = F10             
+keycode  90 = F13             
+keycode  91 = space           
+	control	keycode  91 = nul             
+keycode  92 = space           
+	control	keycode  92 = nul             
+keycode  93 =
+keycode  94 = exclam          
+keycode  95 =
+keycode  96 =
+keycode  97 =
+keycode  98 =
+keycode  99 =
+keycode 100 =
+keycode 101 =
+keycode 102 =
+keycode 103 = Shift           
+keycode 104 = Control         
+keycode 105 = Control         
+keycode 106 = Alt             
+keycode 107 = Alt             
+keycode 108 = AltGr           
+keycode 109 =
+keycode 110 =
+keycode 111 =
+keycode 112 =
+keycode 113 =
+keycode 114 =
+keycode 115 =
+keycode 116 =
+keycode 117 =
+keycode 118 =
+keycode 119 =
+keycode 120 = F24
+keycode 121 =
+keycode 122 =
+keycode 123 =
+keycode 124 =
+keycode 125 =
+keycode 126 =
+keycode 127 =
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 3fbbda4cf8..76755e1744 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 = "r48"
+PR = "r51"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -30,15 +30,16 @@ SRC_URI = "file://halt \
            file://umountnfs.sh \
            file://sysfs.sh \
            file://device_table.txt \
-	   file://populate-volatile.sh \
-	   file://volatiles \
-           file://corgikeymap-2.6.map \
-           file://tosakeymap-2.6.map"
+           file://populate-volatile.sh \
+           file://volatiles \
+           file://keymap"
 
-SRC_URI_append_arm = " file://alignment.sh"
-SRC_URI_append_openzaurus = " file://checkversion"
-SRC_URI_append_c7x0 =    " file://keymap"
-SRC_URI_append_tosa =    " file://keymap"
+SRC_URI_append_arm          = " file://alignment.sh"
+SRC_URI_append_openzaurus   = " file://checkversion"
+SRC_URI_append_c7x0         = " file://keymap-*.map"
+SRC_URI_append_tosa         = " file://keymap-*.map"
+SRC_URI_append_akita        = " file://keymap-*.map"
+SRC_URI_append_spitz        = " file://keymap-*.map"
 
 def read_kernel_version(d):
 	import bb
@@ -95,21 +96,19 @@ do_install () {
 
 	if [ "${DISTRO}" == "openzaurus" ]; then
 		cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}${sysconfdir}/init.d/checkversion
-        	chmod 0755 				${D}${sysconfdir}/init.d/checkversion
-		ln -sf          ../init.d/checkversion  ${D}${sysconfdir}/rcS.d/S01version
+		chmod 0755	${D}${sysconfdir}/init.d/checkversion
+		ln -sf		../init.d/checkversion  ${D}${sysconfdir}/rcS.d/S01version
 	fi
 
-	if [ "${MACHINE}" == "c7x0" ]; then
-		install -m 0755    ${WORKDIR}/corgikeymap-2.6.map		${D}${sysconfdir}
-		install -m 0755    ${WORKDIR}/keymap				${D}${sysconfdir}/init.d
-		ln -sf          ../init.d/keymap  				${D}${sysconfdir}/rcS.d/S00keymap
-	fi
-
-	if [ "${MACHINE}" == "tosa" ]; then
-		install -m 0755    ${WORKDIR}/tosakeymap-2.6.map		${D}${sysconfdir}
-		install -m 0755    ${WORKDIR}/keymap				${D}${sysconfdir}/init.d
-		ln -sf          ../init.d/keymap  				${D}${sysconfdir}/rcS.d/S00keymap
-	fi
+    case ${MACHINE} in
+        c7x0 | tosa | spitz | akita )
+			install -m 0755 ${WORKDIR}/keymap		${D}${sysconfdir}/init.d
+			ln -sf	../init.d/keymap	${D}${sysconfdir}/rcS.d/S00keymap
+			install -m 0644 ${WORKDIR}/keymap-*.map	${D}${sysconfdir}
+			;;
+        *)
+			;;
+    esac
 
 	install -m 0755 ${WORKDIR}/banner	${D}${sysconfdir}/init.d/banner
 	install -m 0755 ${WORKDIR}/devices	${D}${sysconfdir}/init.d/devices
@@ -150,5 +149,5 @@ do_install () {
 		ln -sf	../init.d/alignment.sh	${D}${sysconfdir}/rcS.d/S06alignment
 	fi
 
-	install -m 0755    ${WORKDIR}/device_table.txt		${D}${sysconfdir}/device_table
+	install -m 0755		${WORKDIR}/device_table.txt		${D}${sysconfdir}/device_table
 }