From 2507b57f8a9f5092e4e8628c32e30b98cd7fc767 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 19 Nov 2004 09:24:14 +0000 Subject: Merge bk://openembedded@openembedded.bkbits.net/packages-devel into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/11/19 00:53:13+01:00 uni-frankfurt.de!mickeyl oz-3.5.2: final cvsdate bump before the code goes gold. GPE folks: Please adjust the fixed GPE versions as needed _before_ weekend. 2004/11/18 23:26:00+01:00 uni-frankfurt.de!mickeyl fix section to something more common for rdesktop* 2004/11/18 23:24:27+01:00 uni-frankfurt.de!mickeyl Merge bk://openembedded@openembedded.bkbits.net/packages-devel into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/11/18 23:24:03+01:00 uni-frankfurt.de!mickeyl the most recent lirc now works again. disable PREFERRED_PROVIDER in oz.conf BKrev: 419dbbbelZjDCJE55rmTaYXlroJ28Q --- conf/distro/openzaurus-3.5.2.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'conf') diff --git a/conf/distro/openzaurus-3.5.2.conf b/conf/distro/openzaurus-3.5.2.conf index e8502ee38a..2915d042eb 100644 --- a/conf/distro/openzaurus-3.5.2.conf +++ b/conf/distro/openzaurus-3.5.2.conf @@ -1,13 +1,13 @@ include conf/distro/openzaurus.conf DISTRO = "openzaurus" -FEED_URIS_openzaurus = " \ +FEED_URIS += " \ upgrades##http://openzaurus.org/official/unstable/3.5.2/upgrades/ \ base##http://openzaurus.org/official/unstable/3.5.2/feed/base/ \ libs##http://openzaurus.org/official/unstable/3.5.2/feed/libs/ \ console##http://openzaurus.org/official/unstable/3.5.2/feed/console" -CVSDATE = 20041117 +CVSDATE = 20041120 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" @@ -31,8 +31,6 @@ PREFERRED_VERSION_glibc = "2.3.2+cvs20040726" PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5" PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22" PREFERRED_VERSION_bluez-utils-dbus = "2.11" -PREFERRED_VERSION_lirc = "0.6.6" -PREFERRED_VERSION_lirc-modules = "0.6.6" # # Opie -- cgit v1.2.3