From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 13 Feb 2005 12:51:16 +0000 (+0000)
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~15040
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e318a5342fb9ff0125c4936d38d4562ad39b0a0;p=openembedded.git

Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into allanon.vanille.de:/local/pkg/oe/packages

2005/02/13 13:50:59+01:00 vanille.de!mickeyl
oz.conf: use += for assume_provided. that way we don't override settings in local.conf

BKrev: 420f4d44xKyMhTNPY-7uPTbQH1MewA
---

diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index d1dfffa4ac..ffe4832a6b 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -19,7 +19,7 @@ CVSDATE = "20050213"
 # Zaurus
 #
 
-ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
+ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
 OEINCLUDELOGS = "yes"
 KERNEL_CONSOLE = "tty1"
 #DEBUG_OPTIMIZATION = "-O -g3"