[oe-core 0/6] Merge more stuff from meta-oe

[Martin Jansa <martin.jansa@gmail.com>]

The following changes since commit 0809f98e995d3a2ce24ad25bade3dcd5154061fd:

  lighttpd 1.4.29: rename index.html to avoid clashes with DL_DIR (2011-11-07 14:03:38 +0000)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib jansa/pull2
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull2

Martin Jansa (6):
  libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes
    from meta-oe
  kbd: import from meta-oe
  kbd: add RREPLACES/RCONFLICTS/RPROVIDES for upgradeable path from
    console-tools
  task-core-boot, keymaps: add another VIRTUAL-RUNTIME to allow
    distributions to use different set of initscripts or no initscripts
    at all
  keymaps: depend on kbd instead of console-tools
  task-core-x11: use VIRTUAL-RUNTIME variables for xserver_common and
    graphical_init_manager

 meta/recipes-bsp/keymaps/keymaps_1.0.bb       |    9 +++++++--
 meta/recipes-core/kbd/kbd_1.15.2.bb           |   24 ++++++++++++++++++++++++
 meta/recipes-core/tasks/task-core-boot.bb     |    6 ++++--
 meta/recipes-graphics/libsdl/libsdl_1.2.14.bb |   18 ++++++++++++------
 meta/recipes-sato/tasks/task-core-x11.bb      |   10 ++++++++--
 5 files changed, 55 insertions(+), 12 deletions(-)
 create mode 100644 meta/recipes-core/kbd/kbd_1.15.2.bb

-- 
1.7.7.2