Patchwork [V2,0/3] Enable xserver-xorg for all qemumachines

login
register
mail settings
Submitter Khem Raj
Date May 9, 2012, 12:27 a.m.
Message ID <cover.1336522880.git.raj.khem@gmail.com>
Download mbox
Permalink /patch/27321/
State New
Headers show

Pull-request

git://git.openembedded.org/openembedded-core-contrib kraj/qemu-xserver-xorg

Comments

Khem Raj - May 9, 2012, 12:27 a.m.
XSERVER has a weak definition like below

meta/recipes-sato/tasks/task-core-x11-mini.bb:XSERVER ?= "xserver-kdrive-fbdev"
meta/recipes-sato/tasks/task-core-x11.bb:XSERVER ?= "xserver-kdrive-fbdev"

which means when we user ??= in qemu.inc it does not work since the
above definitions kick in before ??=

so for now we re-arrage inclusion of qemu.inc in x86 and x86-64
case so that the XSERVER definition from respective machine file
is preferred and for all other qemu machines the definition from
qemu.inc is used. Non qemu machines will still use kdrive
as they used to.

The following changes since commit 043871d7e5d2d19c2ff43e54d2ff180c09e8903e:

  kern-tools: integrate minor fixes (2012-05-08 16:06:15 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib kraj/qemu-xserver-xorg
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/qemu-xserver-xorg

Khem Raj (3):
  qemumachines: Enable xserver-xorg as default xserver
  xserver-xf86-config: Add xorg.conf for arm,mips,ppc,sh qemu machines
  xserver-xorg: Fix build on powerpc

 meta/conf/machine/include/qemu.inc                 |    9 ++-
 meta/conf/machine/qemux86-64.conf                  |    3 +-
 meta/conf/machine/qemux86.conf                     |    3 +-
 .../xserver-xf86-config/qemuarm/xorg.conf          |   69 ++++++++++++++++++++
 .../xserver-xf86-config/qemumips/xorg.conf         |   69 ++++++++++++++++++++
 .../xserver-xf86-config/qemumips64/xorg.conf       |   69 ++++++++++++++++++++
 .../xserver-xf86-config/qemuppc/xorg.conf          |   69 ++++++++++++++++++++
 .../xserver-xf86-config/qemush4/xorg.conf          |   69 ++++++++++++++++++++
 .../xorg-xserver/xserver-xf86-config_0.1.bb        |    2 +-
 .../xorg-xserver/xserver-xorg-1.11.2.inc           |    9 ++-
 .../xserver-xorg-1.11.2/gcc-47-warning.patch       |   33 +++++++++
 11 files changed, 396 insertions(+), 8 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch