diff options
| author | Chris Lord <chris@openedhand.com> | 2005-02-16 21:51:49 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2005-02-16 21:51:49 +0000 |
| commit | 1bb39af626c79a6aa0d3c76fd3183f291238585b (patch) | |
| tree | 66c017a445fabdee0b674fa4a5a4bf6947f835ff | |
| parent | 868e9cbdaae715ce90b765c636583d6ca555495d (diff) | |
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
| -rw-r--r-- | conf/machine/collie.conf | 4 |
1 files changed, 2 insertions, 2 deletions
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 \ |