summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2008.1.conf10
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