diff options
author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
---|---|---|
committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
commit | f45580a1527dccdda100eee7f25f9f2c41af4db8 (patch) | |
tree | 2218d4955f368e1804d86f212cc78317b4327f77 /conf/distro/minimal.conf | |
parent | 887b437869709625f5323438808ded9990cf590a (diff) | |
parent | e3df24d64a48aff19aa9960dd9308a071b243b09 (diff) | |
download | openembedded-f45580a1527dccdda100eee7f25f9f2c41af4db8.tar.gz |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
recipes/enotes/enotes_svn.bb
recipes/intone-video/intone-video_svn.bb
recipes/intone/intone_svn.bb
recipes/shr/shr-wizard_git.bb
recipes/tasks/task-shr-minimal.bb
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'conf/distro/minimal.conf')
-rw-r--r-- | conf/distro/minimal.conf | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 33eceab456..1e9eec20f4 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -84,20 +84,6 @@ LIBC ?= "eglibc" require conf/distro/include/sane-toolchain.inc ############################################################################# -# PREFERRED PROVIDERS -############################################################################# -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_avahi = "avahi" -PREFERRED_PROVIDER_gconf = "gconf-dbus" -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_virtual/libusb0 ?= "libusb" - -############################################################################# # PREFERRED VERSIONS ############################################################################# require conf/distro/include/sane-srcdates.inc |