diff options
| author | Mike Westerhof <mwester@dls.net> | 2006-04-11 03:19:51 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-11 03:19:51 +0000 |
| commit | 0c21d985cd31b9c3f14aed86c0632e160d5a3549 (patch) | |
| tree | 84ee3cdd290cea4a659bd4a36c967a0f346d536b /conf/machine/include | |
| parent | 2b1e71a99eb85c82e4f5fbe16ad7d99ca250072a (diff) | |
| parent | 734c5296cdfc25ec221233f49455e1280a64a595 (diff) | |
merge of 39e43f0486c5d18bb8979c53687235b3f04855de
and 738b5da14d9fd2be6600c5eb848647017fac3413
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/poodle-2.6.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/tosa-2.4.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell-2.4.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell-2.6.conf | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index b1dcd7fe3b..9076355522 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" PCMCIA_MANAGER ?= "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ -${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ +${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" # Ethernet modules diff --git a/conf/machine/include/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf index 88df07cddb..068d8c4677 100644 --- a/conf/machine/include/tosa-2.4.conf +++ b/conf/machine/include/tosa-2.4.conf @@ -4,7 +4,7 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \ +BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils keymaps \ kernel-module-acm \ kernel-module-evdev kernel-module-net-fd \ kernel-module-pxa-bi kernel-module-registers \ diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf index af66c7294e..b2ca8370e7 100644 --- a/conf/machine/include/zaurus-clamshell-2.4.conf +++ b/conf/machine/include/zaurus-clamshell-2.4.conf @@ -10,7 +10,7 @@ PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x" PREFERRED_VERSION_orinoco-modules = "0.13e" 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 keymaps irda-utils hostap-utils prism3-firmware prism3-support \ wpa-supplicant-nossl ppp ppp-dialin openswan" # Misc Modules diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index e73028d7ee..97030e66a7 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -7,7 +7,7 @@ PREFERRED_VERSION_wpa_supplicant = "0.4.7" PCMCIA_MANAGER ?= "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ -${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ +${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" # Ethernet modules @@ -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 " |