From 8b332a7d145009ca232ca695ccff9c6b63b6cedb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 6 Dec 2009 19:01:33 +0100 Subject: shr.conf: remove preferred providers set already in compatibility-providers.conf Signed-off-by: Martin Jansa --- conf/distro/shr.conf | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) (limited to 'conf') diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index 4bee840064..92d50d472a 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -156,34 +156,13 @@ require conf/distro/include/sane-toolchain.inc ############################################################################# # PREFERRED PROVIDERS ############################################################################# -PREFERRED_PROVIDER_qemu-native = "qemu-native" -PREFERRED_PROVIDER_gconf = "gconf" -PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-tux" -PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr" PREFERRED_PROVIDER_gpsd = "fso-gpsd" -PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr" -PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr" -PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr" -PREFERRED_PROVIDER_libfribidi = "fribidi" -PREFERRED_PROVIDER_bluez-libs = "bluez4" -PREFERRED_PROVIDER_bluez-utils = "bluez4" -PREFERRED_PROVIDER_classpath = "classpath" -PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" -PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" -PREFERRED_PROVIDER_virtual/gail = "gtk+" -PREFERRED_PROVIDER_opkg = "opkg" -PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial" PREFERRED_PROVIDER_atd = "atd-over-fso" -PREFERRED_PROVIDER_qt4x11 = "qt4-x11-free" -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_avahi = "avahi" -PREFERRED_PROVIDER_gtk+ = "gtk+" -PREFERRED_PROVIDER_libgpewidget = "libgpewidget" -PREFERRED_PROVIDER_virtual/db = "db3" -PREFERRED_PROVIDER_virtual/db-native = "db3-native" -PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_opkg= "opkg" PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" +PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr" +PREFERRED_PROVIDER_virtual/update-alternatives-native = "opkg-native" +PREFERRED_PROVIDER_virtual/update-alternatives = "opkg" ############################################################################# # PREFERRED VERSIONS -- cgit v1.2.3