diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-07-20 21:53:39 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-20 21:53:39 +0000 |
| commit | f15f94e2172ee62bbcef33c6e9fd4bfb03f492e4 (patch) | |
| tree | 8ac200d03a174ce62facbb02370a8bdc24d712dc /conf | |
| parent | 8aba67c458151eb8e611c7548029774be457a3cc (diff) | |
| parent | 4eaa7b8d5d19da6cdd23f4d62992ac2a1a8d0e68 (diff) | |
merge of 4a7d921e80850f7a639e03de72acc36c6badae3a
and e29528cd2e6cd7c36e18b6318938ec5cbb2c01db
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/openslug.conf | 2 | ||||
| -rw-r--r-- | conf/machine/tosa-2.4.conf | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 7535f63a01..6f321b50a6 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -103,7 +103,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" # Tracking the latest version, so the following is commented out. # Uncomment it before release! -#PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2" +PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2" PREFERRED_VERSION_ixp4xx-csr ?= "1.4" PREFERRED_VERSION_ixp425-eth ?= "1.1" diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/tosa-2.4.conf index 22ade477e2..da1d1de542 100644 --- a/conf/machine/tosa-2.4.conf +++ b/conf/machine/tosa-2.4.conf @@ -2,19 +2,19 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules wlan-ng-utils virtual/kernel hostap-modules \ - orinoco-modules sharp-sdmmc-support usbutils" -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 \ - kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ - kernel-module-usb-storage \ - kernel hostap-modules-cs orinoco-modules-cs \ - sharp-sdmmc-support kernel-module-pxa-bi \ - kernel-module-ip-gre \ - kernel-module-irnet kernel-module-ipip kernel-module-usbcore \ - kernel-module-usbdcore kernel-module-usbdmonitor" + orinoco-modules sharp-sdmmc-support usbutils console-tools" + +BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \ + kernel-module-acm \ + kernel-module-evdev kernel-module-net-fd \ + kernel-module-pxa-bi kernel-module-registers \ + kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ + kernel hostap-modules-cs orinoco-modules-cs \ + sharp-sdmmc-support kernel-module-pxa-bi \ + kernel-module-ip-gre kernel-module-irnet kernel-module-ipip \ + kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor kernel-module-usb-storage" RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \ - kernel-module-usbmouse kernel-module-hid usbutils \ - kernel-module-evdev" + kernel-module-usbmouse kernel-module-hid usbutils \ + kernel-module-evdev" |