summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-17 20:15:52 +0000
committerChris Larson <clarson@kergoth.com>2004-11-17 20:15:52 +0000
commit3a7fa86414e4199a411d4ac92ba7df4b201304f4 (patch)
treea1a746bea0d1df8a379c7ce28c8d2799028ba22e /conf
parent8470d4cbf86191a53927a2de6eeb313b52752770 (diff)
Merge nslu2-linux@nslu2-linux.bkbits.net:packages
into hyperion.kergoth.com:/home/kergoth/code/packages 2004/11/17 20:31:25+01:00 uni-frankfurt.de!mickeyl fix iqnotes SRC_URI. i mirrored it since upstream seems gone for good 2004/11/17 20:26:55+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/17 20:26:38+01:00 uni-frankfurt.de!mickeyl we need opie-packagemanager-cvs for 3.5.2 2004/11/17 20:26:06+01:00 hrw.one.pl!hrw Merge bk://openembedded@openembedded.bkbits.net/packages-devel into home.hrw.one.pl:/home/hrw/zaurus/oe/packages 2004/11/17 20:24:23+01:00 hrw.one.pl!hrw Merge bk://openembedded@openembedded.bkbits.net/packages-devel into home.hrw.one.pl:/home/hrw/zaurus/oe/packages 2004/11/17 20:24:08+01:00 hrw.one.pl!hrw added some packages to meta-opie 2004/11/17 20:24:07+01:00 uni-frankfurt.de!mickeyl opie-collections.inc: remove irda-utils, which is already in handhelds-common 2004/11/17 20:20:57+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/17 20:20:47+01:00 uni-frankfurt.de!mickeyl add openobex-apps and irda-utils to opie base 2004/11/17 20:20:30+01:00 uni-frankfurt.de!mickeyl fix sound module deps for collie 2004/11/17 20:03:37+01:00 hrw.one.pl!hrw Merge bk://openembedded@openembedded.bkbits.net/packages-devel into home.hrw.one.pl:/home/hrw/zaurus/oe/packages 2004/11/17 19:54:34+01:00 hrw.one.pl!hrw added qpe-vexed 1.3 2004/11/17 12:44:23-06:00 (none)!kergoth Change the default udevdir to /dev, and kill the long form commandline arguments on the start-stop-daemon calls in udev's startup script. 2004/11/17 17:18:33+01:00 local!hrw Unbork a few of the glibc PROVIDES bits in glibc 2.3.2 20040726 snapshot BKrev: 419bb178SWxMJEIF1b5Fr6nkZDZpXg
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/openzaurus-3.5.2.conf5
-rw-r--r--conf/machine/collie.conf3
2 files changed, 5 insertions, 3 deletions
diff --git a/conf/distro/openzaurus-3.5.2.conf b/conf/distro/openzaurus-3.5.2.conf
index 91de0a60a3..2c3a4a92f8 100644
--- a/conf/distro/openzaurus-3.5.2.conf
+++ b/conf/distro/openzaurus-3.5.2.conf
@@ -7,7 +7,7 @@ FEED_URIS_openzaurus = " \
libs##http://openzaurus.org/official/unstable/3.5.2/feed/libs/ \
console##http://openzaurus.org/official/unstable/3.5.2/feed/console"
-CVSDATE = 20041115
+CVSDATE = 20041117
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"
@@ -30,6 +30,7 @@ PREFERRED_VERSION_orinoco-modules = "0.13e"
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"
#
# Opie
@@ -139,7 +140,7 @@ PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-oxygen = "1.0.0"
PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
+# PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 2c652fa5e0..ac28317fba 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -10,7 +10,8 @@ BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-s
BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules-cs orinoco-modules \
sharp-sdmmc-support kernel-module-devinfo kernel-module-gpio kernel-module-net-fd \
kernel-module-registers kernel-module-sa1100-bi kernel-module-usbdcore \
-kernel-module-usbdmonitor kernel-module-collie-ssp kernel-module-collie-tc35143af"
+kernel-module-usbdmonitor"
+# kernel-module-collie-ssp kernel-module-collie-tc35143af"
# This is needed for the ramdisk script to work
BOOTSTRAP_EXTRA_DEPENDS += "e2fsprogs"