From aa1177323ac2d2475e92a62101bf694c815190db Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 12 Apr 2006 16:31:50 +0000
Subject: [PATCH] oe/packages: Remove borzoi machine

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@350 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../base-files/base-files/borzoi/fstab        |  28 --
 .../initscripts-1.0/borzoi/devices            |  68 -----
 .../initscripts-1.0/borzoi/keymap-2.4.map     | 128 --------
 .../initscripts-1.0/borzoi/keymap-2.6.map     | 213 -------------
 .../packages/initscripts/initscripts_1.0.bb   |   3 +-
 .../pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts |  28 --
 .../packages/tslib/tslib/borzoi/tslib.sh      |  16 -
 openembedded/packages/tslib/tslib_cvs.bb      |   2 +-
 .../xserver/xserver-kdrive_20050207.bb        |   2 -
 .../packages/zaurus-updater/borzoi/updater.sh | 283 ------------------
 .../packages/zaurus-updater/zaurus-updater.bb |   2 +-
 11 files changed, 3 insertions(+), 770 deletions(-)
 delete mode 100644 openembedded/packages/base-files/base-files/borzoi/fstab
 delete mode 100644 openembedded/packages/initscripts/initscripts-1.0/borzoi/devices
 delete mode 100644 openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
 delete mode 100644 openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map
 delete mode 100644 openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts
 delete mode 100644 openembedded/packages/tslib/tslib/borzoi/tslib.sh
 delete mode 100644 openembedded/packages/zaurus-updater/borzoi/updater.sh

diff --git a/openembedded/packages/base-files/base-files/borzoi/fstab b/openembedded/packages/base-files/base-files/borzoi/fstab
deleted file mode 100644
index 3d0e508dfd..0000000000
--- a/openembedded/packages/base-files/base-files/borzoi/fstab
+++ /dev/null
@@ -1,28 +0,0 @@
-# don't mount /dev/mtdblock2 since Spitz uses pivot_root
-# or 2.6 directly boots from the hdd
-# /dev/mtdblock2     /            jffs2   rw,noatime              1  1
-rootfs             /            auto    defaults                1  1
-proc               /proc        proc    defaults                0  0
-# we can use a normal var filesystem with a microdrive
-# tmpfs              /var         tmpfs   defaults                0  0
-tmpfs              /media/ram   tmpfs   defaults                0  0
-
-# Compact Flash memory cards
-/dev/hdc1       /media/cf       auto    defaults,sync,noauto    0  0
-# SD/MMC in kernel 2.4
-/dev/mmcda1     /media/card     auto    defaults,sync,noauto    0  0
-# SD/MMC in kernel 2.6
-/dev/mmcblk0p1  /media/card     auto    defaults,sync,noauto    0  0
-
-#
-# USB
-#
-/dev/sda1       /media/usbhdd   vfat            noauto,umask=000,noatime,iocharset=utf8,codepage=932    0  0
-devpts          /dev/pts        devpts          mode=0620,gid=5       0  0
-usbfs           /proc/bus/usb   usbfs           noauto                0  0
-
-#
-# Harddisk
-#
-/dev/hda2           /home           ext3	defaults    0  0
-/dev/hda3           /media/hdd      vfat	defaults    0  0
diff --git a/openembedded/packages/initscripts/initscripts-1.0/borzoi/devices b/openembedded/packages/initscripts/initscripts-1.0/borzoi/devices
deleted file mode 100644
index 083090ecb9..0000000000
--- a/openembedded/packages/initscripts/initscripts-1.0/borzoi/devices
+++ /dev/null
@@ -1,68 +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
-
-# exit without doing anything if udev is active
-if test -e /dev/.udevdb; then
-    exit 0
-fi
-
-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
-	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
-	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/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map b/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
deleted file mode 100644
index e6339979e8..0000000000
--- a/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
+++ /dev/null
@@ -1,128 +0,0 @@
-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       
-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             Left             Left             Left		Decr_Console            
-keycode  36 = Up               Up               PageUp           Up               Up              
-keycode  37 = Down             Down             PageDown         Down             Down            
-keycode  38 = Right            Right            Right             Right            Right	Incr_Console           
-keycode  39 = Return           Return           Return           Return           Return          
-keycode  40 = F12              VoidSymbol       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      
-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            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      
-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 = 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            
-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 = VoidSymbol       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/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map b/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map
deleted file mode 100644
index 6fc3a9a9cf..0000000000
--- a/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map
+++ /dev/null
@@ -1,213 +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
-	altgr keycode 15 = 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 = comma		slash
-	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              
-	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"
-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/openembedded/packages/initscripts/initscripts_1.0.bb b/openembedded/packages/initscripts/initscripts_1.0.bb
index d9b93005f5..7b50d23f73 100644
--- a/openembedded/packages/initscripts/initscripts_1.0.bb
+++ b/openembedded/packages/initscripts/initscripts_1.0.bb
@@ -40,7 +40,6 @@ 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"
-SRC_URI_append_borzoi       = " file://keymap-*.map"
 SRC_URI_append_collie       = " file://keymap-*.map"
 SRC_URI_append_poodle       = " file://keymap-*.map"
 
@@ -105,7 +104,7 @@ do_install () {
 	fi
 
     case ${MACHINE} in
-        c7x0 | tosa | spitz | akita | borzoi | collie | poodle )
+        c7x0 | tosa | spitz | akita | collie | poodle )
 			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}
diff --git a/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts b/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts
deleted file mode 100644
index c67df8e348..0000000000
--- a/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts
+++ /dev/null
@@ -1,28 +0,0 @@
-# ATA/IDE drive adapter configuration
-#
-# The address format is "scheme,socket,serial_no[,part]".
-#
-# For multi-partition devices, first return list of partitions in
-# $PARTS.  Then, we'll get called for each partition.
-#
-case "$ADDRESS" in
-*,1,*,*)
-    # Socket 1 is the internal HD; don't do anything clever as it's /
-    ;;
-*,*,*,1)
-    #INFO="Sample IDE setup"
-    DO_FSTAB="n";
-    #DO_FSCK="y" ;
-    DO_MOUNT="y"
-    #FSTYPE="msdos"
-    #FSTYPE="auto"
-    #OPTS=""
-    #MOUNTPT="/mnt/ide"
-    ;;
-*,*,*)
-    PARTS="1"
-    # Card eject policy options
-    NO_CHECK=n
-    NO_FUSER=y
-    ;;
-esac
diff --git a/openembedded/packages/tslib/tslib/borzoi/tslib.sh b/openembedded/packages/tslib/tslib/borzoi/tslib.sh
deleted file mode 100644
index dc7484cada..0000000000
--- a/openembedded/packages/tslib/tslib/borzoi/tslib.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-case `uname -r` in
-2.4*)
-	TSLIB_TSDEVICE=/dev/ts
-	TSLIB_TSEVENTTYPE=CORGI
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
-	;;
-*)
-	TSLIB_TSDEVICE=/dev/input/event1
-	TSLIB_TSEVENTTYPE=INPUT
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi
-	;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
diff --git a/openembedded/packages/tslib/tslib_cvs.bb b/openembedded/packages/tslib/tslib_cvs.bb
index 67ed66482c..cf79999b25 100644
--- a/openembedded/packages/tslib/tslib_cvs.bb
+++ b/openembedded/packages/tslib/tslib_cvs.bb
@@ -45,7 +45,7 @@ do_install_append() {
 		done
 		rm -f ${D}${sysconfdir}/ts.conf
 		;;
-	c7x0 | spitz | akita | tosa | borzoi )
+	c7x0 | spitz | akita | tosa )
 		install -d ${D}${datadir}/tslib
 		for f in ts.conf-corgi ts.conf-corgi-2.4; do
 			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
diff --git a/openembedded/packages/xserver/xserver-kdrive_20050207.bb b/openembedded/packages/xserver/xserver-kdrive_20050207.bb
index 2b007d4809..2379c251b2 100644
--- a/openembedded/packages/xserver/xserver-kdrive_20050207.bb
+++ b/openembedded/packages/xserver/xserver-kdrive_20050207.bb
@@ -52,7 +52,6 @@ SRC_URI_append_poodle = 	" file://xserver-kdrive-poodle.patch;patch=1 \
 				  file://faster-rotated.patch;patch=1"
 SRC_URI_append_spitz =          " file://faster-rotated.patch;patch=1"
 SRC_URI_append_akita =          " file://faster-rotated.patch;patch=1"
-SRC_URI_append_borzoi =         " file://faster-rotated.patch;patch=1"
 
 PACKAGE_ARCH_mnci = "mnci"
 PACKAGE_ARCH_collie = "collie"
@@ -60,7 +59,6 @@ PACKAGE_ARCH_poodle = "poodle"
 PACKAGE_ARCH_h3600 = "h3600"
 PACKAGE_ARCH_spitz = "spitz"
 PACKAGE_ARCH_akita = "akita"
-PACKAGE_ARCH_borzoi = "borzoi"
 
 S = "${WORKDIR}/xserver"
 
diff --git a/openembedded/packages/zaurus-updater/borzoi/updater.sh b/openembedded/packages/zaurus-updater/borzoi/updater.sh
deleted file mode 100644
index 0c18966fdb..0000000000
--- a/openembedded/packages/zaurus-updater/borzoi/updater.sh
+++ /dev/null
@@ -1,283 +0,0 @@
-#!/bin/sh
-
-#
-# Noodles' simpler update script. SL-C3000 only for the moment.
-#
-
-DATAPATH=$1
-TMPPATH=/tmp/update
-TMPDATA=$TMPPATH/tmpdata.bin
-TMPHEAD=$TMPPATH/tmphead.bin
-
-WFLG_KERNEL=0
-WFLG_INITRD=0
-WFLG_HDD=0
-
-RO_MTD_LINE=`cat /proc/mtd | grep "root" | tail -n 1`
-if [ "$RO_MTD_LINE" = "" ]; then
-    RO_MTD_LINE=`cat /proc/mtd | grep "\<NAND\>.*\<2\>" | tail -n 1`
-fi
-RO_MTD_NO=`echo $RO_MTD_LINE | cut -d: -f1 | cut -dd -f2`
-RO_MTD_SIZE_HEX=`echo $RO_MTD_LINE | cut -d" " -f2`
-RO_MTD=/dev/mtd$RO_MTD_NO
-RO_MTDBLK=/dev/mtdblock$RO_MTD_NO
-RO_MTD_SIZE=`dc 0x$RO_MTD_SIZE_HEX 1024 /`
-
-RW_MTD_LINE=`cat /proc/mtd | grep "home" | tail -n 1`
-if [ "$RW_MTD_LINE" = "" ]; then
-    RW_MTD_LINE=`cat /proc/mtd | grep "\<NAND\>.*\<2\>" | tail -n 1`
-fi
-RW_MTD_NO=`echo $RW_MTD_LINE | cut -d: -f1 | cut -dd -f2`
-RW_MTD_SIZE_HEX=`echo $RW_MTD_LINE | cut -d" " -f2`
-RW_MTD=/dev/mtd$RW_MTD_NO
-RW_MTDBLK=/dev/mtdblock$RW_MTD_NO
-RW_MTD_SIZE=`dc 0x$RW_MTD_SIZE_HEX 1024 /`
-
-LOGOCAL_MTD=/dev/mtd1
-
-VERBLOCK=0x48000
-MVRBLOCK=0x70000
-
-RESULT=0
-
-Cleanup(){
-	rm -f $VTMPNAME > /dev/null 2>&1
-	rm -f $MTMPNAME > /dev/null 2>&1
-	rm $CTRLPATH/* > /dev/null 2>&1
-	exit $1
-}
-trap 'Cleanup 1' 1 15
-trap '' 2 3
-
-get_dev_pcmcia()
-{
-while read SOCKET CLASS DRIVER INSTANCE DEVS MAJOR MINOR;
-do
-    echo $DEVS
-done
-}
-get_dev_pcmcia_slot()
-{
-    grep "^$1" /var/lib/pcmcia/stab | get_dev_pcmcia
-}
-sleep 1
-IDE1=`get_dev_pcmcia_slot 1`
-if [ "$IDE1" = "" ]; then
-    echo "Error!! There is no HDD. Now retrying..."
-    while [ "$IDE1" = "" ]; do
-	IDE1=`get_dev_pcmcia_slot 1`
-    done
-    echo "Found HDD!!"
-fi
-
-#LINUXFMT=ext2
-LINUXFMT=ext3
-MKE2FSOPT=
-if [ "$LINUXFMT" = "ext3" ]; then
-	MKE2FSOPT=-j
-fi
-
-
-### Check model ###
-/sbin/writerominfo
-MODEL=`cat /proc/deviceinfo/product`
-if [ "$MODEL" != "SL-C3000" ] && [ "$MODEL" != "SL-C3100" ]
-then
-	echo 'MODEL:'$MODEL
-	echo 'ERROR:Invalid model!'
-	echo 'Please reset'
-	while true
-	do
-	done
-fi
-
-### Check that we have a valid tar
-for TARNAME in gnu-tar GNU-TAR
-do
-	if [ -e $DATAPATH/$TARNAME ]
-	then
-		TARBIN=$DATAPATH/$TARNAME
-	fi
-done
-
-if [ ! -e $TARBIN ]; then
-	echo 'Please place a valid copy of tar as "gnu-tar" on your card'
-	echo 'Please reset'
-	while true
-	do
-	done
-fi
-
-mkdir -p $TMPPATH > /dev/null 2>&1
-
-cd $DATAPATH/
-
-#
-# First do the kernel.
-#
-for TARGETFILE in zImage.bin zimage.bin ZIMAGE.BIN
-do
-	if [ -e $TARGETFILE -a $WFLG_KERNEL = 0 ]
-	then
-		# Get the size of the kernel.
-		DATASIZE=`wc -c $TARGETFILE`
-		DATASIZE=`echo $DATASIZE | cut -d' ' -f1`
-
-		echo 'Updating kernel.'
-		echo $TARGETFILE':'$DATASIZE' bytes'
-		/sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE \
-			$TARGETFILE > /dev/null 2>&1
-
-		WFLG_KERNEL=1
-
-	fi
-done
-
-#
-# Now do the initrd.
-#
-for TARGETFILE in initrd.bin INITRD.BIN
-do
-	if [ -e $TARGETFILE -a $WFLG_INITRD = 0 ]
-	then
-		rm -f $TMPPATH/*.bin > /dev/null 2>&1
-		DATASIZE=`wc -c $TARGETFILE`
-		DATASIZE=`echo $DATASIZE | cut -d' ' -f1`
-
-		WFLG_INITRD=1
-		echo 'RO file system'
-		MODULEID=6
-		MODULESIZE=0x500000
-		ADDR=0
-		TARGET_MTD=$RO_MTD
-		DATAPOS=16
-		ONESIZE=1048576
-		/sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE
-		
-		echo -n 'Flash erasing...'
-		/sbin/eraseall $TARGET_MTD 2> /dev/null > /dev/null
-		echo 'done'
-
-		echo ''
-		echo '0%                      100%'
-		PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
-		PROGSTEP=`expr 28 / $PROGSTEP`
-		if [ $PROGSTEP = 0 ]
-		then
-			PROGSTEP=1
-		fi
-
-		#00 means header information
-		VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
-		MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
-		/sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
-		/sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
-
-		#echo 'found header'
-		/sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1
-		/sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1
-
-		#loop
-		while [ $DATAPOS -lt $DATASIZE ]
-		do
-			#data create
-			bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE
-			TMPSIZE=`wc -c $TMPDATA`
-			TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1`
-			DATAPOS=`expr $DATAPOS + $TMPSIZE`
-
-			#handle data file
-			#echo 'ADDR='$ADDR
-			#echo 'SIZE='$TMPSIZE
-			next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD  2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
-			if [ "$next_addr" = "" ]; then
-				echo "ERROR:flash write"
-				rm $TMPDATA > /dev/null 2>&1
-				RESULT=3
-				break;
-			fi
-			ADDR=$next_addr
-
-			rm $TMPDATA > /dev/null 2>&1
-
-			#progress
-			SPNUM=0
-			while [ $SPNUM -lt $PROGSTEP ]
-			do
-				echo -n '.'
-				SPNUM=`expr $SPNUM + 1`
-			done
-		done
-
-		echo ''
-
-		#finish
-		rm -f $TMPPATH/*.bin > /dev/null 2>&1
-
-		if [ $RESULT = 0 ]
-		then
-			/sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
-			/sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
-
-			rm -f $VTMPNAME > /dev/null 2>&1
-			rm -f $MTMPNAME > /dev/null 2>&1
-			echo 'Success!'
-		else
-			echo 'Error!'
-			exit $RESULT
-		fi
-	fi
-done
-
-## HDD image
-for TARGETFILE in hdimage1.tgz HDIMAGE1.TGZ
-do
-	if [ -e $TARGETFILE ]; then
-		if [ $WFLG_HDD != 0 ]
-		then
-			continue
-		fi
-		WFLG_HDD=1
-		echo ''
-		echo 'HDD RO file system'
-		if [ ! -f /hdd1/NotAvailable ]; then
-		    umount /hdd1
-		fi
-		echo 'Now formatting...'
-		mke2fs $MKE2FSOPT /dev/${IDE1}1 2> /dev/null > /dev/null
-		e2fsck -p /dev/${IDE1}1 > /dev/null
-		if [ "$?" != "0" ]; then
-		    echo "Error!"
-		    exit "$?"
-		fi
-
-		mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1
-		if [ "$?" != "0" ]; then
-		    echo "Error!"
-		    exit "$?"
-		fi
-    
-		cd /hdd1
-
-		#This can be useful for debugging
-		#/bin/sh -i
-		
-		
-		echo 'Now extracting...'
-		gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
-		if [ "$?" != "0" ]; then
-		    echo "Error!"
-		    exit "$?"
-		fi
-
-		echo 'Success!'
-		
-		
-		# remount as RO
-		cd /
-		umount /hdd1
-		mount -t $LINUXFMT -o ro,noatime /dev/${IDE1}1 /hdd1
-	fi
-done
-
-exit 0
diff --git a/openembedded/packages/zaurus-updater/zaurus-updater.bb b/openembedded/packages/zaurus-updater/zaurus-updater.bb
index 2aff497de1..b8a87ce7dc 100644
--- a/openembedded/packages/zaurus-updater/zaurus-updater.bb
+++ b/openembedded/packages/zaurus-updater/zaurus-updater.bb
@@ -19,7 +19,7 @@ do_deploy() {
 	install -m 0755 updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
 
 	case ${MACHINE} in
-		spitz | borzoi )
+		spitz )
 			install -m 0755 gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar
 			;;
         	*)