diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-04-08 19:18:40 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-08 19:18:40 +0000 |
| commit | 52dcccdfd31b0b0c9ac4725dd52a20b88a6b7b7c (patch) | |
| tree | 06a634a182886ead6e16e3dad4fb1b3dc258ec4c | |
| parent | 5bcdb4abd61e4d64aec042d9bb27e8ff275530b3 (diff) | |
* Remove 2.4 machine support for c7x0, akita, spitz and borzoi.
* Remove borzoi machine entirely as its now equal to spitz.
* For remaining 2.4/2.6 split machines use ZKERNEL_VERSION instead of KERNEL_VERSION
to fix a long standing bug - people will need to update local.conf.
* Add dummy terrier MACHINE to point at spitz.
48 files changed, 18 insertions, 1273 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 18d942198a..6ca56971ab 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -74,7 +74,6 @@ PREFERRED_PROVIDER_hostap-conf = "hostap-conf" PCMCIA_MANAGER_c7x0 = "pcmciautils" PCMCIA_MANAGER_akita = "pcmciautils" PCMCIA_MANAGER_spitz = "pcmciautils" -PCMCIA_MANAGER_borzoi = "pcmciautils" PCMCIA_MANAGER_nokia770 = "pcmciautils" PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" @@ -90,6 +89,5 @@ GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" #GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" #GPE_EXTRA_INSTALL_append_akita = " libgtkinput" #GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" -#GPE_EXTRA_INSTALL_append_borzoi = " libgtkinput" diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 9ea8897bff..4417b67862 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -89,8 +89,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # ASSUME_PROVIDED += "qemu-native" # Uncomment this to select a particular kernel version if supported by -# your MACHINE setting. Currently only supported on Zaurus Clamshells. -# KERNEL_VERSION = "2.6" +# your MACHINE setting. Currently only supported by poodle and tosa. +# ZKERNEL_VERSION = "2.6" # Uncomment one of these to build packages during the build process. # This is done automatically if you set DISTRO (see above) diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index da699e7258..89c0d031ee 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -2,9 +2,7 @@ #@NAME: Sharp Zaurus SL-C1000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device -KERNEL_VERSION ?= "2.6" - include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell-2.6.conf ROOT_FLASH_SIZE = "58" diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf index 10ffb80c32..d037a1f779 100644 --- a/conf/machine/borzoi.conf +++ b/conf/machine/borzoi.conf @@ -1,21 +1,2 @@ -#@TYPE: Machine -#@NAME: Sharp Zaurus SL-C3100 -#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3100 device - -KERNEL_VERSION ?= "2.6" - -include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf - -PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" -PIVOTBOOT_EXTRA_RRECOMMENDS += "" - -# Useful things for the built-in Harddisk -BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" - -IMAGE_FSTYPES = "jffs2 tar.gz" - -ROOT_FLASH_SIZE = "100" -# actually that should really read ROOTFS_SIZE = "100", because with modern kernels, -# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte - +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Sharp SL-C3100,\n* because \ +its very similar to the SL-C3000. Use MACHINE = \"spitz\".\n*\n*\n')}" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index af1c9dad1c..0bd9623526 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,10 +2,8 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -KERNEL_VERSION ?= "2.6" - include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell-2.6.conf ROOT_FLASH_SIZE = "25" # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it. diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index 95f3c528e8..97030e66a7 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -46,5 +46,4 @@ BOOTSTRAP_EXTRA_SOUND = "kernel-module-soundcore kernel-module-snd kernel-mod BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " -BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index a1bf5fbec3..8c83416919 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -5,8 +5,8 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te poodle" -KERNEL_VERSION ?= "2.4" -include conf/machine/include/poodle-${KERNEL_VERSION}.conf +ZKERNEL_VERSION ?= "2.4" +include conf/machine/include/poodle-${ZKERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf index 7a558a731d..f3edef9890 100644 --- a/conf/machine/qemuarm.conf +++ b/conf/machine/qemuarm.conf @@ -2,8 +2,6 @@ #@NAME: qemu ARM Emulator setup #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation -KERNEL_VERSION ?= "2.6" - TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te qemuarm" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 212da52587..f78dd7a3b9 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -2,10 +2,8 @@ #@NAME: Sharp Zaurus SL-C3000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device -KERNEL_VERSION ?= "2.6" - include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell-2.6.conf PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" PIVOTBOOT_EXTRA_RRECOMMENDS += "" diff --git a/conf/machine/terrier.conf b/conf/machine/terrier.conf new file mode 100644 index 0000000000..ca6a20daf5 --- /dev/null +++ b/conf/machine/terrier.conf @@ -0,0 +1,2 @@ +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Sharp SL-C3200,\n* because \ +its very similar to the SL-C3000/SL-C3100. Use MACHINE = \"spitz\".\n*\n*\n')}" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index b573f5721d..3485937186 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -5,8 +5,8 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te tosa" -KERNEL_VERSION ?= "2.4" -include conf/machine/include/tosa-${KERNEL_VERSION}.conf +ZKERNEL_VERSION ?= "2.4" +include conf/machine/include/tosa-${ZKERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" diff --git a/packages/base-files/base-files/borzoi/.mtn2git_empty b/packages/base-files/base-files/borzoi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/base-files/base-files/borzoi/.mtn2git_empty +++ /dev/null diff --git a/packages/base-files/base-files/borzoi/fstab b/packages/base-files/base-files/borzoi/fstab deleted file mode 100644 index 3d0e508dfd..0000000000 --- a/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/packages/gpe-login/gpe-login_0.83.bb b/packages/gpe-login/gpe-login_0.83.bb index 2b50f4a103..6e6a0092b6 100644 --- a/packages/gpe-login/gpe-login_0.83.bb +++ b/packages/gpe-login/gpe-login_0.83.bb @@ -15,7 +15,6 @@ SRC_URI += "file://busybox-bad-perms.patch;patch=1" SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1" SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_borzoi = " file://highdpifontfix.patch;patch=1" SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" diff --git a/packages/gpe-login/gpe-login_0.86.bb b/packages/gpe-login/gpe-login_0.86.bb index 093c291134..f6eb0c921a 100644 --- a/packages/gpe-login/gpe-login_0.86.bb +++ b/packages/gpe-login/gpe-login_0.86.bb @@ -13,7 +13,6 @@ PR = "r0" SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1" SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_borzoi = " file://highdpifontfix.patch;patch=1" SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb index c57366399d..3b8f8a958f 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb @@ -18,7 +18,6 @@ SRC_URI += "file://matchbox-session \ SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1" SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_borzoi = " file://highdpifontfix.patch;patch=1" SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" diff --git a/packages/initscripts/initscripts-1.0/borzoi/.mtn2git_empty b/packages/initscripts/initscripts-1.0/borzoi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/initscripts/initscripts-1.0/borzoi/.mtn2git_empty +++ /dev/null diff --git a/packages/initscripts/initscripts-1.0/borzoi/devices b/packages/initscripts/initscripts-1.0/borzoi/devices deleted file mode 100755 index 083090ecb9..0000000000 --- a/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/packages/keylaunch/files/borzoi/.mtn2git_empty b/packages/keylaunch/files/borzoi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/keylaunch/files/borzoi/.mtn2git_empty +++ /dev/null diff --git a/packages/keylaunch/files/borzoi/keylaunchrc b/packages/keylaunch/files/borzoi/keylaunchrc deleted file mode 100644 index f5e1fd70be..0000000000 --- a/packages/keylaunch/files/borzoi/keylaunchrc +++ /dev/null @@ -1,24 +0,0 @@ -key=....F9:-:gpe-contacts -key=....F10:-:gpe-calendar -key=....F13:-:sylpheed -key=....F12:-:~matchbox-remote -next -key=...*F12:-:~matchbox-remote -desktop -key=....F11:-:~matchbox-remote -menu -#key=...*1:-:~zoom out -#key=...*2:-:~zoom in -key=...*3:-:~display-brightness.sh down -key=...*4:-:~display-brightness.sh up - -# LCD Softkeys -# Please note that the space _between_ two softkeys can be used, too ;) -#key=....F5:-: -key=....F15:-:~matchbox-remote -next -#key=....F6:-: -key=....F16:-:sylpheed -#key=....F7:-: -key=....F17:-:gpe-contacts -#key=....F8:-: -key=....F18:-:gpe-calendar -#key=....F19:-: -#key=....F19:-: -#key=....F10:-: diff --git a/packages/keymap-locales/files/borzoi/.mtn2git_empty b/packages/keymap-locales/files/borzoi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/keymap-locales/files/borzoi/.mtn2git_empty +++ /dev/null diff --git a/packages/keymap-locales/files/borzoi/keymap-extension-2.4-de.map b/packages/keymap-locales/files/borzoi/keymap-extension-2.4-de.map deleted file mode 100644 index 0a43c8d107..0000000000 --- a/packages/keymap-locales/files/borzoi/keymap-extension-2.4-de.map +++ /dev/null @@ -1,8 +0,0 @@ -# German keymappings -shift altgr keycode 1 = +Adiaeresis -shift altgr keycode 15 = +Odiaeresis -shift altgr keycode 21 = +Udiaeresis -altgr keycode 1 = +adiaeresis -altgr keycode 15 = +odiaeresis -altgr keycode 21 = +udiaeresis -altgr keycode 19 = ssharp diff --git a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map deleted file mode 100644 index d33d4de1aa..0000000000 --- a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map +++ /dev/null @@ -1,10 +0,0 @@ -# German keymapping -charset "iso-8859-1" -altgr keycode 24 = +odiaeresis -altgr keycode 30 = +adiaeresis -altgr keycode 22 = +udiaeresis -shift altgr keycode 24 = +Odiaeresis -shift altgr keycode 30 = +Adiaeresis -altgr shift keycode 22 = +Udiaeresis -altgr keycode 31 = ssharp - diff --git a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map deleted file mode 100644 index 4640bd56d4..0000000000 --- a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map +++ /dev/null @@ -1,7 +0,0 @@ -# Finnish keymapping -charset "iso-8859-1" -altgr keycode 24 = +odiaeresis -altgr keycode 30 = +adiaeresis -shift altgr keycode 24 = +Odiaeresis -shift altgr keycode 30 = +Adiaeresis - diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb index e54fea1d2d..595faec89f 100644 --- a/packages/keymap-locales/keymap-locales.bb +++ b/packages/keymap-locales/keymap-locales.bb @@ -12,7 +12,6 @@ SRC_URI = "file://*.map" # be my guest =) PACKAGES_akita = "keymap-extension-de keymap-extension-fi" PACKAGES_spitz = "keymap-extension-de keymap-extension-fi" -PACKAGES_borzoi = "keymap-extension-de keymap-extension-fi" PACKAGES_c7x0 = "keymap-extension-de keymap-extension-fi" PACKAGES_collie = "keymap-extension-de keymap-extension-fi" diff --git a/packages/keymaps/files/borzoi/.mtn2git_empty b/packages/keymaps/files/borzoi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/keymaps/files/borzoi/.mtn2git_empty +++ /dev/null diff --git a/packages/keymaps/files/borzoi/keymap-2.4.map b/packages/keymaps/files/borzoi/keymap-2.4.map deleted file mode 100644 index e6339979e8..0000000000 --- a/packages/keymaps/files/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/packages/keymaps/files/borzoi/keymap-2.6.map b/packages/keymaps/files/borzoi/keymap-2.6.map deleted file mode 100644 index 11a0e8b4d3..0000000000 --- a/packages/keymaps/files/borzoi/keymap-2.6.map +++ /dev/null @@ -1,228 +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 - - -# LCD Softkeys as represented by zaurusd -keycode 82 = F5 -keycode 79 = F15 # Home -keycode 80 = F6 -keycode 81 = F16 # Email -keycode 75 = F7 -keycode 76 = F17 # Addresses -keycode 77 = F8 -keycode 71 = F18 # Calendar -keycode 72 = F9 -keycode 73 = F19 # Book -keycode 78 = F10 - -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/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb index bd47dc13d5..350a7e0e08 100644 --- a/packages/keymaps/keymaps_1.0.bb +++ b/packages/keymaps/keymaps_1.0.bb @@ -25,7 +25,7 @@ do_install () { install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/ case ${MACHINE} in - c7x0 | tosa | spitz | akita | borzoi | collie | poodle ) + c7x0 | tosa | spitz | akita | collie | poodle ) install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir} ;; *) diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index d2a2e4a153..cb0c5291ec 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -26,7 +26,6 @@ COMPATIBLE_HOST = "arm.*-linux" CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw" -CMDLINE_ROOT_borzoi = "root=/dev/hda1 rootfstype=ext3 rw" CMDLINE_OTHER = "dyntick=enable" CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' @@ -39,7 +38,6 @@ export rd = ${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"} CMDLINE_MEM_collie = "mem=${mem}M" CMDLINE_ROTATE_spitz = "fbcon=rotate:1" CMDLINE_ROTATE_akita = "fbcon=rotate:1" -CMDLINE_ROTATE_borzoi = "fbcon=rotate:1" CMDLINE_ROTATE_collie = "fbcon=rotate:1" CMDLINE_ROTATE_poodle = "fbcon=rotate:1" CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}" @@ -56,13 +54,12 @@ module_autoload_pxaficp_ir = "pxaficp_ir" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-soc-corgi_c7x0 = "snd-soc-corgi" module_autoload_snd-soc-spitz_akita = "snd-soc-spitz" -module_autoload_snd-soc-spitz_borzoi = "snd-soc-spitz" module_autoload_snd-soc-spitz_spitz = "snd-soc-spitz" do_configure() { case ${MACHINE} in - akita | spitz | borzoi ) + akita | spitz ) install -m 0644 ${WORKDIR}/defconfig-cxx00 ${S}/.config || die "No default configuration for cxx00 available." ;; *) @@ -105,7 +102,7 @@ do_configure() { # Check the kernel is below the 1272*1024 byte limit for the PXA Zaurii do_compile_append() { case ${MACHINE} in - c7x0 | akita | poodle | spitz | borzoi | tosa ) + c7x0 | akita | poodle | spitz | tosa ) size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` if [ $size -ge 1302000 ]; then rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} diff --git a/packages/matchbox-wm/matchbox-wm/borzoi/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/borzoi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/matchbox-wm/matchbox-wm/borzoi/.mtn2git_empty +++ /dev/null diff --git a/packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig b/packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig deleted file mode 100644 index 7de0071c08..0000000000 --- a/packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig +++ /dev/null @@ -1,51 +0,0 @@ -# -# This is an example keyboard config file for matchbox -# -# You can edit this file or change per user by copying to -# ~/.matchbox/kbdconfig -# -# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox ) - -### Window operation short cuts - -<Alt>n=next -<Alt>p=prev -<Alt>c=close -<Alt>d=desktop -<Alt>m=!matchbox-remote -mbmenu - -### App launching. - -<ctrl><alt>x=!xterm -<ctrl><alt>r=!rxvt - -### App launching with startup notify - -<ctrl><alt>e=!!gpe-calender - -### windows style key shortcuts - -<alt>Tab=next -<alt><shift>Tab=prev - -<alt>space=taskmenu -<alt>escape=!matchbox-remote -mbmenu -<alt>f4=close - -# On SL-Cxxxx, F11 is the "menu" key. In order to be able to assign a function -# to this key via keylaunch, this must be commented out. -# NOTE: Uncommenting this usually means that matchbox crashes on startup! -# -# f11=fullscreen - -### super should be a 'window' key, uncomment '#' if you have one. - -#<super>d=desktop -#<super>r=!xterm -#<super>e=!!nautilus - -### Special keys, likely probably only available on extended keyboards. - -#App=!matchbox-remote -mbmenu -#Menu=!matchbox-remote -mbmenu - diff --git a/packages/meta/task-opie.bb b/packages/meta/task-opie.bb index b8952a520f..f8e39b7ee0 100644 --- a/packages/meta/task-opie.bb +++ b/packages/meta/task-opie.bb @@ -48,7 +48,6 @@ RDEPENDS_task-opie-base-applets_append_mnci = " opie-vtapplet opie-logouta RDEPENDS_task-opie-base-applets_append_c7x0 = " opie-autorotateapplet" RDEPENDS_task-opie-base-applets_append_spitz = " opie-autorotateapplet" RDEPENDS_task-opie-base-applets_append_akita = " opie-autorotateapplet" -RDEPENDS_task-opie-base-applets_append_borzoi = " opie-autorotateapplet" RDEPENDS_task-opie-base-inputmethods = "opie-multikey opie-handwriting opie-handwriting-classicset" diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc index ffbe655b76..6ca4e12d78 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -21,7 +21,6 @@ PIXMAP_SIZE = "" PIXMAP_SIZE_c7x0 = "-640x480" PIXMAP_SIZE_spitz = "-640x480" PIXMAP_SIZE_akita = "-640x480" -PIXMAP_SIZE_borzoi = "-640x480" PIXMAP_SIZE_tosa = "-480x640" PIXMAP_SIZE_simpad = "-800x600" diff --git a/packages/opie-taskbar/opie-taskbar/borzoi/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/borzoi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-taskbar/opie-taskbar/borzoi/.mtn2git_empty +++ /dev/null diff --git a/packages/opie-taskbar/opie-taskbar/borzoi/qpe.conf b/packages/opie-taskbar/opie-taskbar/borzoi/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/borzoi/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/.mtn2git_empty b/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/.mtn2git_empty +++ /dev/null diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts b/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts deleted file mode 100644 index c67df8e348..0000000000 --- a/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/packages/prboom/prboom-devconfig/borzoi/.mtn2git_empty b/packages/prboom/prboom-devconfig/borzoi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/prboom/prboom-devconfig/borzoi/.mtn2git_empty +++ /dev/null diff --git a/packages/prboom/prboom-devconfig/borzoi/prboom.cfg b/packages/prboom/prboom-devconfig/borzoi/prboom.cfg deleted file mode 100644 index cd17d0baff..0000000000 --- a/packages/prboom/prboom-devconfig/borzoi/prboom.cfg +++ /dev/null @@ -1,313 +0,0 @@ -# Doom config file -# Format: -# variable value - -# Misc settings -default_compatibility_level -1 -realtic_clock_rate 100 -max_player_corpse 32 -flashing_hom 0 -demo_insurance 2 -endoom_mode 0x5 -level_precache 0 - -# Files -wadfile_1 "prboom.wad" -wadfile_2 "" -dehfile_1 "" -dehfile_2 "" - -# Game settings -default_skill 2 -weapon_recoil 0 -doom_weapon_toggles 1 -player_bobbing 1 -monsters_remember 1 -monster_infighting 1 -monster_backing 0 -monster_avoid_hazards 1 -monkeys 0 -monster_friction 1 -help_friends 1 -player_helpers 0 -friend_distance 128 -dog_jumping 1 -sts_always_red 1 -sts_pct_always_gray 0 -sts_traditional_keys 0 -traditional_menu 1 -show_messages 1 -autorun 0 - -# Compatibility settings -comp_zombie 0 -comp_infcheat 0 -comp_stairs 0 -comp_telefrag 0 -comp_dropoff 0 -comp_falloff 0 -comp_staylift 0 -comp_doorstuck 0 -comp_pursuit 0 -comp_vile 0 -comp_pain 0 -comp_skull 0 -comp_blazing 0 -comp_doorlight 0 -comp_god 0 -comp_skymap 0 -comp_floors 0 -comp_model 0 -comp_zerotags 0 -comp_moveblock 0 -comp_sound 0 - -# Sound settings -sound_card -1 -music_card -1 -pitched_sounds 0 -samplerate 22050 -sfx_volume 8 -music_volume 8 -mus_pause_opt 2 -sounddev "/dev/dsp" -snd_channels 8 - -# Video settings -screen_width 540 -screen_height 380 -fake_contrast 1 -use_fullscreen 1 -use_doublebuffer 1 -translucency 1 -tran_filter_pct 66 -screenblocks 10 -usegamma 3 -X_options 0x0 - -# Mouse settings -use_mouse 1 -mouse_sensitivity_horiz 10 -mouse_sensitivity_vert 10 -mouseb_fire 0 -mouseb_strafe 1 -mouseb_forward 2 - -# Key bindings -key_right 0xae -key_left 0xac -key_up 0xad -key_down 0xaf -key_menu_right 0xae -key_menu_left 0xac -key_menu_up 0xad -key_menu_down 0xaf -key_menu_backspace 0x7f -key_menu_escape 0x1b -key_menu_enter 0x10d -key_strafeleft 0x2c -key_straferight 0x2e -key_fire 0x10d -key_use 0x20 -key_strafe 0xb8 -key_speed 0xb6 -key_savegame 0xbc -key_loadgame 0xbd -key_soundvolume 0xbe -key_hud 0xbf -key_quicksave 0xc0 -key_endgame 0xc1 -key_messages 0xc2 -key_quickload 0xc3 -key_quit 0xc4 -key_gamma 0xd7 -key_spy 0xd8 -key_pause 0xff -key_autorun 0xba -key_chat 0x74 -key_backspace 0x7f -key_enter 0xd -key_map 0x9 -key_map_right 0xae -key_map_left 0xac -key_map_up 0xad -key_map_down 0xaf -key_map_zoomin 0x3d -key_map_zoomout 0x2d -key_map_gobig 0x30 -key_map_follow 0x66 -key_map_mark 0x6d -key_map_clear 0x63 -key_map_grid 0x67 -key_map_rotate 0x72 -key_map_overlay 0x6f -key_reverse 0x2f -key_zoomin 0x3d -key_zoomout 0x2d -key_chatplayer1 0x67 -key_chatplayer2 0x69 -key_chatplayer3 0x62 -key_chatplayer4 0x72 -key_weapontoggle 0x30 -key_weapon1 0x31 -key_weapon2 0x32 -key_weapon3 0x33 -key_weapon4 0x34 -key_weapon5 0x35 -key_weapon6 0x36 -key_weapon7 0x37 -key_weapon8 0x38 -key_weapon9 0x39 -key_screenshot 0x2a - -# Joystick settings -use_joystick 0 -joy_left 0 -joy_right 0 -joy_up 0 -joy_down 0 -joyb_fire 0 -joyb_strafe 1 -joyb_speed 2 -joyb_use 3 - -# Chat macros -chatmacro0 "No" -chatmacro1 "I'm ready to kick butt!" -chatmacro2 "I'm OK." -chatmacro3 "I'm not looking too good!" -chatmacro4 "Help!" -chatmacro5 "You suck!" -chatmacro6 "Next time, scumbag..." -chatmacro7 "Come here!" -chatmacro8 "I'll take care of it." -chatmacro9 "Yes" - -# Automap settings -mapcolor_back 0xf7 -mapcolor_grid 0x68 -mapcolor_wall 0x17 -mapcolor_fchg 0x37 -mapcolor_cchg 0xd7 -mapcolor_clsd 0xd0 -mapcolor_rkey 0xaf -mapcolor_bkey 0xcc -mapcolor_ykey 0xe7 -mapcolor_rdor 0xaf -mapcolor_bdor 0xcc -mapcolor_ydor 0xe7 -mapcolor_tele 0x77 -mapcolor_secr 0xfc -mapcolor_exit 0x0 -mapcolor_unsn 0x68 -mapcolor_flat 0x58 -mapcolor_sprt 0x70 -mapcolor_item 0xe7 -mapcolor_hair 0xd0 -mapcolor_sngl 0xd0 -mapcolor_me 0x70 -mapcolor_frnd 0x70 -map_secret_after 0 -map_point_coord 0 -automapmode 0x0 - -# Heads-up display settings -hudcolor_titl 5 -hudcolor_xyco 3 -hudcolor_mesg 6 -hudcolor_chat 5 -hudcolor_list 5 -hud_msg_lines 1 -hud_list_bgon 0 -hud_distributed 0 -health_red 25 -health_yellow 50 -health_green 100 -armor_red 25 -armor_yellow 50 -armor_green 100 -ammo_red 25 -ammo_yellow 50 -hud_active 2 -hud_displayed 0 -hud_nosecrets 0 - -# Weapon preferences -weapon_choice_1 6 -weapon_choice_2 9 -weapon_choice_3 4 -weapon_choice_4 3 -weapon_choice_5 2 -weapon_choice_6 8 -weapon_choice_7 5 -weapon_choice_8 7 -weapon_choice_9 1 - -# Music -mus_e1m1 "e1m1.mp3" -mus_e1m2 "e1m2.mp3" -mus_e1m3 "e1m3.mp3" -mus_e1m4 "e1m4.mp3" -mus_e1m5 "e1m5.mp3" -mus_e1m6 "e1m6.mp3" -mus_e1m7 "e1m7.mp3" -mus_e1m8 "e1m8.mp3" -mus_e1m9 "e1m9.mp3" -mus_e2m1 "e2m1.mp3" -mus_e2m2 "e2m2.mp3" -mus_e2m3 "e2m3.mp3" -mus_e2m4 "e2m4.mp3" -mus_e2m5 "e1m7.mp3" -mus_e2m6 "e2m6.mp3" -mus_e2m7 "e2m7.mp3" -mus_e2m8 "e2m8.mp3" -mus_e2m9 "e3m1.mp3" -mus_e3m1 "e3m1.mp3" -mus_e3m2 "e3m2.mp3" -mus_e3m3 "e3m3.mp3" -mus_e3m4 "e1m8.mp3" -mus_e3m5 "e1m7.mp3" -mus_e3m6 "e1m6.mp3" -mus_e3m7 "e2m7.mp3" -mus_e3m8 "e3m8.mp3" -mus_e3m9 "e1m9.mp3" -mus_inter "e2m3.mp3" -mus_intro "intro.mp3" -mus_bunny "bunny.mp3" -mus_victor "victor.mp3" -mus_introa "intro.mp3" -mus_runnin "runnin.mp3" -mus_stalks "stalks.mp3" -mus_countd "countd.mp3" -mus_betwee "betwee.mp3" -mus_doom "doom.mp3" -mus_the_da "the_da.mp3" -mus_shawn "shawn.mp3" -mus_ddtblu "ddtblu.mp3" -mus_in_cit "in_cit.mp3" -mus_dead "dead.mp3" -mus_stlks2 "stalks.mp3" -mus_theda2 "the_da.mp3" -mus_doom2 "doom.mp3" -mus_ddtbl2 "ddtblu.mp3" -mus_runni2 "runnin.mp3" -mus_dead2 "dead.mp3" -mus_stlks3 "stalks.mp3" -mus_romero "romero.mp3" -mus_shawn2 "shawn.mp3" -mus_messag "messag.mp3" -mus_count2 "countd.mp3" -mus_ddtbl3 "ddtblu.mp3" -mus_ampie "ampie.mp3" -mus_theda3 "the_da.mp3" -mus_adrian "adrian.mp3" -mus_messg2 "messag.mp3" -mus_romer2 "romero.mp3" -mus_tense "tense.mp3" -mus_shawn3 "shawn.mp3" -mus_openin "openin.mp3" -mus_evil "evil.mp3" -mus_ultima "ultima.mp3" -mus_read_m "read_m.mp3" -mus_dm2ttl "dm2ttl.mp3" -mus_dm2int "dm2int.mp3" diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 083174ccad..dafccc0823 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -46,7 +46,6 @@ SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1;pnum=0 file:// file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 " SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_borzoi = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 " SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " @@ -102,7 +101,6 @@ EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" -EXTRA_DEFINES_borzoi = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" EXTRA_DEFINES_mnci = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" export SYSCONF_CC = "${CC}" diff --git a/packages/tslib/tslib/borzoi/.mtn2git_empty b/packages/tslib/tslib/borzoi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/tslib/tslib/borzoi/.mtn2git_empty +++ /dev/null diff --git a/packages/tslib/tslib/borzoi/tslib.sh b/packages/tslib/tslib/borzoi/tslib.sh deleted file mode 100644 index 218da0751b..0000000000 --- a/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-2.6.conf - ;; -esac - -export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index 02f0c555ae..78fd48e5fc 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -44,7 +44,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-2.6.conf ts.conf-corgi-2.4; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb index 73d57e93e1..21529a69d9 100644 --- a/packages/xserver/xserver-kdrive_20050207.bb +++ b/packages/xserver/xserver-kdrive_20050207.bb @@ -58,7 +58,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" @@ -66,7 +65,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/packages/zaurus-updater/borzoi/.mtn2git_empty b/packages/zaurus-updater/borzoi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/zaurus-updater/borzoi/.mtn2git_empty +++ /dev/null diff --git a/packages/zaurus-updater/borzoi/updater.sh b/packages/zaurus-updater/borzoi/updater.sh deleted file mode 100644 index 0c18966fdb..0000000000 --- a/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/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index 5f1c7330a5..21c15c7465 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/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 ;; *) |