Zaurus machines conf: dropped console-tools from (R)DEPENDS, added keymaps instead

- keymaps (R)DEPEND on console-tools

6 files changed, 12 insertions, 9 deletions

diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index 2ae4b32c07..ee346e1e9a 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -12,7 +12,8 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
 
-BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
+BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater keymaps"
+BOOTSTRAP_EXTRA_RDEPENDS += "keymaps"
 
 include conf/machine/handheld-common.conf
 
diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/tosa-2.4.conf
index 28254ac5f1..4156bf1b9a 100644
--- a/conf/machine/tosa-2.4.conf
+++ b/conf/machine/tosa-2.4.conf
@@ -6,9 +6,9 @@ PREFERRED_VERSION_orinoco-modules = "0.13e"
 PREFERRED_VERSION_wlan-ng-modules = "0.2.1-pre26"
 
 BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules wlan-ng-utils virtual/kernel hostap-modules \
-			    orinoco-modules sharp-sdmmc-support usbutils console-tools"
+			    orinoco-modules sharp-sdmmc-support usbutils"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \
+BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils \
 				kernel-module-acm \
 				kernel-module-evdev kernel-module-net-fd \
 				kernel-module-pxa-bi kernel-module-registers \
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index dcb52ddb2d..d93cec5e3b 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -12,7 +12,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
 
-BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
+BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater keymaps"
+BOOTSTRAP_EXTRA_RDEPENDS += "keymaps"
 
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim"
diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf
index d61dc197b2..54c1d22251 100644
--- a/conf/machine/zaurus-clamshell-2.4.conf
+++ b/conf/machine/zaurus-clamshell-2.4.conf
@@ -10,11 +10,11 @@ PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x"
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 
 BOOTSTRAP_EXTRA_DEPENDS  += "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
-pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
+pcmcia-cs apmd wireless-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
 wpa-supplicant-nossl ppp ppp-dialin openswan"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
-pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \
+pcmcia-cs apmd apm wireless-tools irda-utils hostap-utils prism3-firmware prism3-support \
 wpa-supplicant-nossl ppp ppp-dialin openswan"
 
 # Misc Modules
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf
index 40c3cb0b1b..c4933ecc63 100644
--- a/conf/machine/zaurus-clamshell-2.6.conf
+++ b/conf/machine/zaurus-clamshell-2.6.conf
@@ -4,11 +4,11 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
 BOOTSTRAP_EXTRA_DEPENDS  += "virtual/kernel udev sysfsutils hostap-modules spectrum-fw orinoco-conf \
-pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
+pcmcia-cs apmd wireless-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
 ppp ppp-dialin openswan wpa-supplicant-nossl"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils hostap-modules-cs spectrum-fw \
-pcmcia-cs apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
+pcmcia-cs apm  wireless-tools irda-utils udev-utils hostap-utils prism3-firmware prism3-support \
 ppp ppp-dialin openswan wpa-supplicant-nossl"
 
 # Ethernet modules
diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf
index f55f2d2554..5ef4c906c0 100644
--- a/conf/machine/zaurus-clamshell.conf
+++ b/conf/machine/zaurus-clamshell.conf
@@ -11,7 +11,8 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 		   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
 		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
 
-BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
+BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater keymaps"
+BOOTSTRAP_EXTRA_RDEPENDS += "keymaps"
 
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge"