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 9b04708..737ea4b 100644 (file)
--- 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 \