From: Chris Lord <chris@openedhand.com>
Date: Wed, 16 Feb 2005 21:51:49 +0000 (+0000)
Subject: Merge
X-Git-Tag: Release-2010-05/1~14968
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bb39af626c79a6aa0d3c76fd3183f291238585b;p=openembedded.git

Merge

2005/02/16 21:49:42+00:00 (none)!cwiiis
Use ?= instead of = for provider of xserver and virtual/kernel in collie.conf

BKrev: 4213c075ACmycGG0JicH6COpPjXmQQ
---

diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 9b04708449..737ea4be75 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -4,8 +4,8 @@
 
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
+PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel ?= "openzaurus-sa"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \
 sharp-sdmmc-support kernel-module-devinfo kernel-module-gpio kernel-module-net-fd \