diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-06-03 11:22:13 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@Powerbook-3.local> | 2009-06-05 17:48:08 +0200 |
| commit | e31e44ee5b26166e3955cddbd4c1ea9a3997eeb1 (patch) | |
| tree | 41b9b637839fd3a63a4f05d3b504012b0fae3f28 | |
| parent | f919392d470640be128053c7f1195a869f844899 (diff) | |
angstrom 2009.X: weakly assign xserver-xorg as default * images can still pick kdrive if wanted
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index d365a38c24..84766a3fc5 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -89,10 +89,6 @@ PREFERRED_PROVIDER_virtual/psplash ?= "psplash-angstrom" PREFERRED_PROVIDER_avahi = "avahi" -#Small machines prefer kdrive, but we might ship full Xorg in other images -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" - #powerpc needs additional patches to gcc ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1" ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" @@ -144,7 +140,6 @@ PREFERRED_PROVIDER_virtual/db ?= "db" PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" @@ -193,6 +188,11 @@ require conf/distro/include/angstrom${ARM_ABI}.inc # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs IPKG_VARIANT = "opkg-nogpg angstrom-version ${ANGSTROM_FEED_CONFIGS}" +# Select xserver-xorg as default, since kdrive has been EOL'ed +XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_xserver ?= "xserver-xorg" + # do some task-base stuff here # Prefer bluez4, it's needed for things like connman. Bluez4 is also largely backward compatible with |