---
conf/distro/include/shr-om-gta02-kms.conf | 5 -----
conf/distro/include/shr-om-gta02.conf | 6 +++++-
recipes/tasks/task-shr-feed.bb | 3 +--
3 files changed, 6 insertions(+), 8 deletions(-)
delete mode 100644 conf/distro/include/shr-om-gta02-kms.conf
diff --git a/conf/distro/include/shr-om-gta02-kms.conf
b/conf/distro/include/shr-om-gta02-kms.conf
deleted file mode 100644
index 2ddce41..0000000
--- a/conf/distro/include/shr-om-gta02-kms.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# SHR-specific overrides for building KMS enabled system
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-drm-devel"
-PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo-kms"
-
-XSERVER = "xserver-xorg xf86-video-glamo-kms xf86-input-evdev
xf86-input-keyboard xf86-input-mouse"
diff --git a/conf/distro/include/shr-om-gta02.conf
b/conf/distro/include/shr-om-gta02.conf
index 070301e..42ba237 100644
--- a/conf/distro/include/shr-om-gta02.conf
+++ b/conf/distro/include/shr-om-gta02.conf
@@ -1,7 +1,11 @@
# SHR-specific overrides to the machine.conf file
+
+# If you want to have KMS enabled in default kernel, uncomment
linux-openmoko-shr-drm-devel
PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
+#PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-drm-devel"
+
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo"
+PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo-kms"
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
MACHINE_DRI_MODULES = "glamo"
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 0c2b537..f66d649 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -27,7 +27,6 @@ RDEPENDS_${PN} += "\
vagalume \
python-pygame \
mokoko \
- bluez-utils-alsa \
# devmem2 \
exhibit \
edje-viewer \
@@ -124,7 +123,7 @@ RDEPENDS_${PN} += "\
# gpsdrive \
wxwidgets \
x11vnc \
- xf86-video-glamo-kms \
+ xf86-video-glamo \
# libswt3.4-gtk-java \
cacao \
# jamvm \
--
1.6.5
_______________________________________________
Shr-devel mailing list
[email protected]
http://lists.shr-project.org/mailman/listinfo/shr-devel
