From f6d738ffa6e538136387c00d75d94bfc3ebc29dd Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 31 Jan 2005 16:53:37 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/31 17:53:23+01:00 uni-frankfurt.de!mickeyl oz-pxa-2.6: add console-tools to BOOTSTRAP_EXTRA_DEPENDS BKrev: 41fe6291R-jgiQ1aE2pe_6vLrlXdhg --- conf/distro/openzaurus-3.5.3.conf | 2 +- conf/machine/openzaurus-pxa-2.6.conf | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf index 6ef40da413..8a3d1f5fbb 100644 --- a/conf/distro/openzaurus-3.5.3.conf +++ b/conf/distro/openzaurus-3.5.3.conf @@ -13,7 +13,7 @@ FEED_URIS += " \ console##http://openzaurus.org/official/unstable/3.5.2/feed/console \ devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel" -CVSDATE = "20050201" +CVSDATE = "20050202" ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie" PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive" diff --git a/conf/machine/openzaurus-pxa-2.6.conf b/conf/machine/openzaurus-pxa-2.6.conf index 5621176eec..ad2ac51c65 100644 --- a/conf/machine/openzaurus-pxa-2.6.conf +++ b/conf/machine/openzaurus-pxa-2.6.conf @@ -8,9 +8,10 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus" PREFERRED_VERSION_orinoco-modules = "cvs" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \ -pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin" +pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin" BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs \ pcmcia-cs apm ppp wireless-tools irda-utils udev-utils" + # kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ # kernel-module-usbdcore kernel-module-usbdmonitor chkhinge" -- cgit v1.2.3