Add KERNEL_VERSION option to select kernel preference for zaurus clamshells. Kill off openzaurus-pxa-2.6 machine type.

BKrev: 420fca1ej6LEvrP_Xe_wpNwLC8AyAQ

10 files changed, 21 insertions, 277 deletions

diff --git a/packages/initscripts/initscripts-1.0/corgi/devices b/packages/initscripts/initscripts-1.0/corgi/devices
index 8ec00bedeb..b3a3323b8a 100644
--- a/packages/initscripts/initscripts-1.0/corgi/devices
+++ b/packages/initscripts/initscripts-1.0/corgi/devices
@@ -43,6 +43,11 @@ else
 	cd /
 	mkdir -p dev/msys
 	mkdir -p dev/pts
+	mkdir -p dev/input
+	mkdir -p dev/vc
+	for i in 0 1 2 3 4 5 6 7 8 9; do
+		ln -s /dev/tty$i /dev/vc/$i
+	done
 	ln -sf /dev/sharp_ts /dev/ts
         ln -sf /dev/sharp_fl /dev/fl
 	ln -sf /proc/self/fd /dev/fd
diff --git a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/keymap.sh b/packages/initscripts/initscripts-1.0/corgi/keymap
index e69de29bb2..e69de29bb2 100644
--- a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/keymap.sh
+++ b/packages/initscripts/initscripts-1.0/corgi/keymap
diff --git a/packages/initscripts/initscripts-1.0/corgikeymap-2.6.map b/packages/initscripts/initscripts-1.0/corgikeymap-2.6.map
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/corgikeymap-2.6.map
diff --git a/packages/initscripts/initscripts-1.0/husky/devices b/packages/initscripts/initscripts-1.0/husky/devices
index 8ec00bedeb..b3a3323b8a 100644
--- a/packages/initscripts/initscripts-1.0/husky/devices
+++ b/packages/initscripts/initscripts-1.0/husky/devices
@@ -43,6 +43,11 @@ else
 	cd /
 	mkdir -p dev/msys
 	mkdir -p dev/pts
+	mkdir -p dev/input
+	mkdir -p dev/vc
+	for i in 0 1 2 3 4 5 6 7 8 9; do
+		ln -s /dev/tty$i /dev/vc/$i
+	done
 	ln -sf /dev/sharp_ts /dev/ts
         ln -sf /dev/sharp_fl /dev/fl
 	ln -sf /proc/self/fd /dev/fd
diff --git a/packages/initscripts/initscripts-1.0/husky/keymap b/packages/initscripts/initscripts-1.0/husky/keymap
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/husky/keymap
diff --git a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/corgikeymap.map b/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/corgikeymap.map
deleted file mode 100644
index 0d261fe708..0000000000
--- a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/corgikeymap.map
+++ /dev/null
@@ -1,211 +0,0 @@
-# Default kernel keymap. This uses 7 modifier combinations.
-keymaps 0-2,4-5,8,12
-# Change the above line into
-#	keymaps 0-2,4-6,8,12
-# in case you want the entries
-#	altgr   control keycode  83 = Boot            
-#	altgr   control keycode 111 = Boot            
-# below.
-#
-keycode   1 =        
-keycode   2 = one              exclam    
-	control alt     keycode  2 = Console_1
-keycode   3 = two              quotedbl			
-	control alt     keycode  3 = Console_2
-keycode   4 = three            numbersign      
-	control alt     keycode  4 = Console_3
-keycode   5 = four             dollar           
-	control alt     keycode  5 = Console_4
-keycode   6 = five             percent         
-	control alt     keycode  6 = Console_5
-keycode   7 = six              ampersand     
-	control alt     keycode  7 = Console_6
-keycode   8 = seven            apostrophe
-keycode   9 = eight            parenleft
-keycode  10 = nine             parenright
-keycode  11 = zero             asciitilde
-keycode  12 = minus            at
-	altgr keycode 12 = at
-keycode  13 = 
-keycode  14 = BackSpace
-	altgr keycode 14 = Delete
-keycode  15 = Tab
-	shift keycode 65 = Caps_Lock
-keycode  16 = q               
-keycode  17 = w               
-	altgr keycode 17 = asciicircum
-keycode  18 = e
-	altgr keycode 18 = equal
-keycode  19 = r          
-	altgr keycode 19 = plus     
-keycode  20 = t               
-	altgr keycode 20 = bracketleft
-keycode  21 = y               
-	altgr keycode 21 = bracketright
-keycode  22 = u      
-	altgr keycode 22 = braceleft         
-keycode  23 = i           
-	altgr keycode 23 = braceright    
-keycode  24 = o               
-keycode  25 = p               
-keycode  26 = 
-keycode  27 =
-keycode  28 = Return          
-keycode  29 = Control         
-keycode  30 = a
-keycode  31 = s               
-keycode  32 = d
-keycode  33 = f
-	altgr keycode 33 = backslash             
-keycode  34 = g               
-	altgr keycode 34 = semicolon
-keycode  35 = h         
-	altgr keycode 35 = colon      
-keycode  36 = j        
-	altgr keycode 36 = asterisk       
-keycode  37 = k   
-    altgr keycode 37 = backslash
-keycode  38 = l         
-	altgr keycode 38 = bar      
-keycode  39 =  
-keycode  40 = 
-keycode  41 =     
-keycode  42 = Shift           
-keycode  43 =  
-keycode  44 = z               
-keycode  45 = x               
-keycode  46 = c
-keycode  47 = v               
-keycode  48 = b
-	altgr keycode 48 = underscore
-keycode  49 = n               
-keycode  50 = m               
-keycode  51 = slash		comma
-	altgr keycode 51 = less
-keycode  52 = period           question         
-	altgr     keycode  52 = greater     
-keycode  53 =      
-keycode  54 = Shift           
-keycode  55 = 
-keycode  56 = Alt             
-keycode  57 = space            space           
-	control keycode  57 = nul   
-keycode 59 = F9
-keycode 60 = F10
-keycode 61 = AltGr
-keycode 62 = Escape
-keycode 63 = Return
-keycode 64 = Escape
-keycode 65 = Down
-keycode 66 = Up
-keycode 67 = Control
-keycode 68 = F13
-keycode 79 = F15
-keycode 80 = F16
-keycode 82 = F17
-keycode 87 = Return
-keycode 88 = F11	          
-keycode 97 = Control  
-keycode 99 = F12       
-keycode 103 = Up              
-keycode 105 = Left            
-	altgr     keycode 105 = Decr_Console
-keycode 106 = Right           
-	altgr     keycode 106 = Incr_Console
-keycode 108 = Down  
-string F1 = "\033[[A"
-string F2 = "\033[[B"
-string F3 = "\033[[C"
-string F4 = "\033[[D"
-string F5 = "\033[[E"
-string F6 = "\033[17~"
-string F7 = "\033[18~"
-string F8 = "\033[19~"
-string F9 = "\033[20~"
-string F10 = "\033[21~"
-string F11 = "\033[23~"
-string F12 = "\033[24~"
-string F13 = "\033[25~"
-string F14 = "\033[26~"
-string F15 = "\033[28~"
-string F16 = "\033[29~"
-string F17 = "\033[31~"
-string F18 = "\033[32~"
-string F19 = "\033[33~"
-string F20 = "\033[34~"
-string Find = "\033[1~"
-string Insert = "\033[2~"
-string Remove = "\033[3~"
-string Select = "\033[4~"
-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 'ÿ'
diff --git a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/devices b/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/devices
deleted file mode 100644
index e138e631a5..0000000000
--- a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/devices
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-#
-# Devfs handling script.  Since we arent running devfsd due to various reasons
-# which I will not lay out here, we need to create some links for compatibility.
-
-. /etc/default/rcS
-
-if test -e /dev/.devfsd
-then
-	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
-	ln -s /dev/touchscreen/0 /dev/ts
-	ln -s /dev/touchscreen/0raw /dev/tsraw
-	ln -s /dev/vc/0 /dev/tty0
-	ln -s /dev/vc/1 /dev/tty1
-	ln -s /dev/vc/2 /dev/tty2
-	ln -s /dev/vc/3 /dev/tty3
-	ln -s /dev/vc/4 /dev/tty4
-	ln -s /dev/vc/5 /dev/tty5
-	ln -s /dev/fb/0 /dev/fb0
-#	ln -s /dev/tts/0 /dev/ttySA0
-#	ln -s /dev/tts/1 /dev/ttySA1
-#	ln -s /dev/tts/2 /dev/ttySA2
-
-	ln -s /dev/sound/dsp /dev/dsp
-	ln -s /dev/sound/mixer /dev/mixer
-
-	ln -s /dev/v4l/video0 /dev/video0
-	ln -s /dev/v4l/video0 /dev/video
-	ln -s /dev/misc/rtc /dev/rtc
-
-	## need this so that ppp will autoload the ppp modules
-	mknod /dev/ppp c 108 0
-	if test "$VERBOSE" != "no"; then echo "done"; fi
-else
-	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
-	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
-	if test $? -ne 0; then
-		if test "$VERBOSE" != "no"; then echo "failed"; fi
-	else
-		if test "$VERBOSE" != "no"; then echo "done"; fi
-	fi
-	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
-	cd /
-	mkdir -p dev/msys
-	mkdir -p dev/pts
-	mkdir -p dev/input
-	ln -sf /dev/sharp_ts /dev/ts
-        ln -sf /dev/sharp_fl /dev/fl
-	ln -sf /proc/self/fd /dev/fd
-	ln -sf /proc/kcore /dev/core
-	/sbin/makedevs -r / -D /etc/device_table
-	if test $? -ne 0; then
-		if test "$VERBOSE" != "no"; then echo "failed"; fi
-	else
-		if test "$VERBOSE" != "no"; then echo "done"; fi
-	fi
-fi
-
-exit 0
diff --git a/packages/initscripts/initscripts-1.0/shepherd/devices b/packages/initscripts/initscripts-1.0/shepherd/devices
index 6a028d9942..b3a3323b8a 100644
--- a/packages/initscripts/initscripts-1.0/shepherd/devices
+++ b/packages/initscripts/initscripts-1.0/shepherd/devices
@@ -43,6 +43,7 @@ else
 	cd /
 	mkdir -p dev/msys
 	mkdir -p dev/pts
+	mkdir -p dev/input
 	mkdir -p dev/vc
 	for i in 0 1 2 3 4 5 6 7 8 9; do
 		ln -s /dev/tty$i /dev/vc/$i
diff --git a/packages/initscripts/initscripts-1.0/shepherd/keymap b/packages/initscripts/initscripts-1.0/shepherd/keymap
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/shepherd/keymap
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index ed22ca46b5..25d884892b 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -5,7 +5,6 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
-RDEPENDS_openzaurus-pxa-2.6 = "makedevs console-tools"
 LICENSE = "GPL"
 PR = "r32"
 
@@ -34,8 +33,12 @@ SRC_URI = "file://halt \
 
 SRC_URI_append_arm = " file://alignment.sh"
 SRC_URI_append_openzaurus = " file://checkversion"
-SRC_URI_append_openzaurus-pxa-2.6 = " file://corgikeymap.map"
-SRC_URI_append_openzaurus-pxa-2.6 = " file://keymap.sh"
+SRC_URI_append_corgi =    " file://keymap"
+SRC_URI_append_shepherd = " file://keymap"
+SRC_URI_append_husky =    " file://keymap"
+SRC_URI_append_corgi =    " file://corgikeymap.map"
+SRC_URI_append_shepherd = " file://corgikeymap.map"
+SRC_URI_append_husky =    " file://corgikeymap.map"
 
 def read_kernel_version(d):
 	import bb
@@ -92,10 +95,10 @@ do_install () {
 		ln -sf          ../init.d/checkversion  ${D}/etc/rcS.d/S05version
 	fi
 
-	if [ "${MACHINE}" == "openzaurus-pxa-2.6" ]; then
-		install -m 0755    ${WORKDIR}/corgikeymap.map		${D}/etc
-		install -m 0755    ${WORKDIR}/keymap.sh			${D}/etc/init.d
-		ln -sf          ../init.d/keymap.sh  	${D}/etc/rcS.d/S04keymap.sh
+	if [ "${MACHINE}" == "corgi" -o "${MACHINE}" == "shepherd" -o "${MACHINE}" == "husky" ]; then
+		install -m 0755    ${WORKDIR}/corgikeymap-2.6.map		${D}/etc
+		install -m 0755    ${WORKDIR}/keymap			${D}/etc/init.d
+		ln -sf          ../init.d/keymap  	${D}/etc/rcS.d/S04keymap
 	fi