summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/angstrom-2006.9.conf2
-rw-r--r--conf/local.conf.sample4
-rw-r--r--conf/machine/akita.conf4
-rw-r--r--conf/machine/borzoi.conf23
-rw-r--r--conf/machine/c7x0.conf4
-rw-r--r--conf/machine/include/zaurus-clamshell-2.6.conf1
-rw-r--r--conf/machine/poodle.conf4
-rw-r--r--conf/machine/qemuarm.conf2
-rw-r--r--conf/machine/spitz.conf4
-rw-r--r--conf/machine/terrier.conf2
-rw-r--r--conf/machine/tosa.conf4
-rw-r--r--packages/base-files/base-files/borzoi/.mtn2git_empty0
-rw-r--r--packages/base-files/base-files/borzoi/fstab28
-rw-r--r--packages/gpe-login/gpe-login_0.83.bb1
-rw-r--r--packages/gpe-login/gpe-login_0.86.bb1
-rw-r--r--packages/gpe-session-scripts/gpe-session-scripts_0.66.bb1
-rw-r--r--packages/hostap/hostap-daemon.inc2
-rw-r--r--packages/hostap/hostap-modules.inc2
-rw-r--r--packages/hostap/hostap-utils.inc2
-rw-r--r--packages/initscripts/initscripts-1.0/borzoi/.mtn2git_empty0
-rwxr-xr-xpackages/initscripts/initscripts-1.0/borzoi/devices68
-rw-r--r--packages/keylaunch/files/borzoi/.mtn2git_empty0
-rw-r--r--packages/keylaunch/files/borzoi/keylaunchrc24
-rw-r--r--packages/keymap-locales/files/borzoi/.mtn2git_empty0
-rw-r--r--packages/keymap-locales/files/borzoi/keymap-extension-2.4-de.map8
-rw-r--r--packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map10
-rw-r--r--packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map7
-rw-r--r--packages/keymap-locales/keymap-locales.bb1
-rw-r--r--packages/keymaps/files/borzoi/.mtn2git_empty0
-rw-r--r--packages/keymaps/files/borzoi/keymap-2.4.map128
-rw-r--r--packages/keymaps/files/borzoi/keymap-2.6.map228
-rw-r--r--packages/keymaps/keymaps_1.0.bb2
-rw-r--r--packages/linux/linux-openzaurus.inc16
-rw-r--r--packages/matchbox-wm/matchbox-wm/borzoi/.mtn2git_empty0
-rw-r--r--packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig51
-rw-r--r--packages/meta/task-opie.bb1
-rw-r--r--packages/opie-taskbar/opie-taskbar.inc1
-rw-r--r--packages/opie-taskbar/opie-taskbar/borzoi/.mtn2git_empty0
-rw-r--r--packages/opie-taskbar/opie-taskbar/borzoi/qpe.conf22
-rw-r--r--packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/.mtn2git_empty0
-rw-r--r--packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts28
-rw-r--r--packages/prboom/prboom-devconfig/borzoi/.mtn2git_empty0
-rw-r--r--packages/prboom/prboom-devconfig/borzoi/prboom.cfg313
-rw-r--r--packages/qte/qte-common_2.3.10.inc2
-rw-r--r--packages/tslib/tslib/borzoi/.mtn2git_empty0
-rw-r--r--packages/tslib/tslib/borzoi/tslib.sh16
-rw-r--r--packages/tslib/tslib_cvs.bb2
-rw-r--r--packages/xserver/xserver-kdrive_20050207.bb2
-rw-r--r--packages/zaurus-updater/borzoi/.mtn2git_empty0
-rw-r--r--packages/zaurus-updater/borzoi/updater.sh283
-rw-r--r--packages/zaurus-updater/zaurus-updater.bb2
51 files changed, 25 insertions, 1281 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/hostap/hostap-daemon.inc b/packages/hostap/hostap-daemon.inc
index 231978df83..c95059efe8 100644
--- a/packages/hostap/hostap-daemon.inc
+++ b/packages/hostap/hostap-daemon.inc
@@ -4,7 +4,7 @@ SECTION = "kernel/userland"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-RDEPENDS = "virtual/kernel-hostap hostap-utils (${PV})"
+RDEPENDS = "hostap-modules hostap-utils (${PV})"
DEPENDS_mtx-1_append = "madwifi-modules"
SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
diff --git a/packages/hostap/hostap-modules.inc b/packages/hostap/hostap-modules.inc
index 6f482e64e4..5ce5e0db67 100644
--- a/packages/hostap/hostap-modules.inc
+++ b/packages/hostap/hostap-modules.inc
@@ -3,8 +3,6 @@ SECTION = "kernel/modules"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PROVIDES = "virtual/kernel-hostap"
-RPROVIDES = "virtual/kernel-hostap"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz"
diff --git a/packages/hostap/hostap-utils.inc b/packages/hostap/hostap-utils.inc
index c5c5d5b3f9..1e4362d0f7 100644
--- a/packages/hostap/hostap-utils.inc
+++ b/packages/hostap/hostap-utils.inc
@@ -4,7 +4,7 @@ SECTION = "kernel/userland"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-RRECOMMENDS = "virtual/kernel-hostap"
+RRECOMMENDS = "hostap-modules"
PR = "r3"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
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