summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-06-06 14:45:48 +0000
committerJohn Bowler <jbowler@nslu2-linux.org>2005-06-06 14:45:48 +0000
commit9499ab1e95b21471373670a1338ee6c5a3e4bc50 (patch)
tree30ac7d1f7ebd6f186f6345c2b864c9c4f01c0e54 /conf
parent75520ee66f1fa1d21b33f72f9ae19823b6f7d38c (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into marsco.kalmiopsis:/home/nslu2/openembedded 2005/06/06 15:42:51+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/06/06 15:42:10+02:00 utwente.nl!koen Fix ts.conf so it actually parses, courtesy Florian Boor 2005/06/06 14:40:46+01:00 reciva.com!pb tweak device node creation in lirc-modules postinst 2005/06/06 14:36:41+01:00 reciva.com!pb need to call "initscript stop" in prerm, not postrm 2005/06/06 13:27:26+02:00 mn-solutions.de!schurig MNCI "Ramses": get rid of my experimental arm-linuxeabi TARGET_ARCH 2005/06/06 13:25:41+02:00 mn-solutions.de!schurig make modutils-cross compile again, tip from do13 on IRC 2005/06/06 13:10:24+02:00 utwente.nl!koen xserver-kdrive-omap_6.6.3.bb: tweak xserver-omap, courtesy Florian Boor 2005/06/06 12:40:49+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/06/06 12:40:28+02:00 uni-frankfurt.de!mickeyl openzaurus-3.5.4: bump CVSDATE 2005/06/06 10:18:58+01:00 reciva.com!pb remove gcc_csl-arm preference on armeb 2005/06/06 10:15:53+01:00 reciva.com!pb disable ifupdown-spurious-environ patch due to segfaults on armeb 2005/06/06 11:04:32+02:00 utwente.nl!koen nokia770.conf: remove unneeded orinoco driver BKrev: 42a4619cgEf5_eucbkPjTgBmQzeUMw
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/openmnci.conf5
-rw-r--r--conf/distro/openzaurus-3.5.4.conf2
-rw-r--r--conf/machine/nokia770.conf1
3 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/openmnci.conf b/conf/distro/openmnci.conf
index fc1b05516c..87d8e2e6b4 100644
--- a/conf/distro/openmnci.conf
+++ b/conf/distro/openmnci.conf
@@ -3,5 +3,6 @@ INHERIT += "debian"
OEINCLUDELOGS = "yes"
KERNEL_CONSOLE = "ttyS0"
-#TARGET_FPU = ""
-TARGET_ARCH = "arm-linuxeabi"
+TARGET_OS = "linux"
+TARGET_FPU = "soft"
+#TARGET_ARCH = "arm-linuxeabi"
diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf
index 384c9b8a47..0591d49918 100644
--- a/conf/distro/openzaurus-3.5.4.conf
+++ b/conf/distro/openzaurus-3.5.4.conf
@@ -14,7 +14,7 @@ FEED_URIS += " \
console##http://openzaurus.org/official/unstable/3.5.3/feed/console \
devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel"
-CVSDATE = "20050528"
+CVSDATE = "20050607"
#
# Zaurus
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index f1e2b96a34..f017726526 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -31,7 +31,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
#build omap1 till nokia releases the patches
PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
-PREFERRED_VERSION_orinoco-modules = "0.15rc1"
BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils \
pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"