diff options
author | Michael Lauer <mickey@vanille-media.de> | 2005-02-13 12:51:16 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2005-02-13 12:51:16 +0000 |
commit | 8e318a5342fb9ff0125c4936d38d4562ad39b0a0 (patch) | |
tree | b74abe840f4c5b50a4317e918d06eda1efe4d438 /conf | |
parent | 4d78352c09f3da769c39d8dbad6e673e341ccef0 (diff) |
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
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/openzaurus-3.5.3.conf | 2 |
1 files changed, 1 insertions, 1 deletions
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" |