[PATCH 0/3] Enable xserver-xorg for all qemumachines

[PATCH 0/3] Enable xserver-xorg for all qemumachines

[Khem Raj]

Currently we use kdrive for all qemu machines except x86 and x86_64
this patchset enables it for other qemu machines too

I did not delete the kdrive recipes intentionally since I saw that
there were some images which were using kdrive as xserver

I have successfully sato image in qemumips qemuarm and qemuppc

The following changes since commit 35b5fb2dd2131d4c7dc6635c14c6e08ea6926457:

  eglibc-package: remove /var (2012-05-01 12:36:18 +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
  qemux86-64,qemux86: Override XSERVER variable

 meta/conf/machine/include/qemu.inc                 |    9 ++-
 meta/conf/machine/qemux86-64.conf                  |    2 +-
 meta/conf/machine/qemux86.conf                     |    2 +-
 .../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 +-
 9 files changed, 356 insertions(+), 4 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

-- 
1.7.5.4

[PATCH 1/3] qemumachines: Enable xserver-xorg as default xserver

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/conf/machine/include/qemu.inc |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 421a149..e384879 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -1,7 +1,14 @@
 PCMCIA_MANAGER = "pcmciautils"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
 
+XSERVER ?= "xserver-xorg \
+            mesa-dri-driver-swrast \
+            xf86-input-evdev \
+            xf86-input-mouse \
+            xf86-video-fbdev \
+            xf86-input-keyboard"
+
 MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen"
 
 IMAGE_FSTYPES += "tar.bz2 ext3"
-- 
1.7.5.4

[PATCH 2/3] xserver-xf86-config: Add xorg.conf for arm, mips, ppc, sh qemu machines

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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 +-
 6 files changed, 346 insertions(+), 1 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

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
new file mode 100644
index 0000000..629ae21
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
@@ -0,0 +1,69 @@
+
+Section "Files"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Generic Keyboard"
+    Driver        "evdev"
+    Option        "CoreKeyboard"
+    Option        "Device"      "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
+    Option        "XkbRules"    "xorg"
+    Option        "XkbModel"    "evdev"
+    Option        "XkbLayout"    "us"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Configured Mouse"
+    Driver        "mouse"
+    Option        "CorePointer"
+    Option        "Device"        "/dev/input/mice"
+    Option        "Protocol"        "ImPS/2"
+    Option        "ZAxisMapping"        "4 5"
+    Option        "Emulate3Buttons"    "true"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Qemu Tablet"
+    Driver        "evdev"
+    Option        "CorePointer"
+    Option        "Device"        "/dev/input/touchscreen0"
+    Option        "USB"           "on"
+EndSection
+
+Section "Device"
+    Identifier    "Graphics Controller"
+    Driver        "fbdev"
+EndSection
+
+Section "Monitor"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
+    # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz
+    Modeline "1024x600_60.00"   49.00  1024 1072 1168 1312  600 603 613 624 -hsync +vsync
+    # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
+    ModeLine "640x480"    25.2  640  656  752  800    480  490  492  525 -hsync -vsync
+    # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
+    ModeLine "640x480"    31.5  640  664  704  832    480  489  491  520 -hsync -vsync
+    # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
+    ModeLine "640x480"    31.5  640  656  720  840    480  481  484  500 -hsync -vsync
+    # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
+    ModeLine "640x480"    36.0  640  696  752  832    480  481  484  509 -hsync -vsync
+EndSection
+
+Section "Screen"
+    Identifier    "Default Screen"
+    Device        "Graphics Controller"
+    Monitor        "Generic Monitor"
+    SubSection "Display"
+        Modes     "640x480"
+    EndSubSection
+EndSection
+
+Section "ServerLayout"
+    Identifier    "Default Layout"
+    Screen        "Default Screen"
+    InputDevice    "Generic Keyboard"
+    # InputDevice    "Configured Mouse"
+    InputDevice    "QEMU Tablet"
+    Option         "AllowEmptyInput" "no"
+EndSection
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
new file mode 100644
index 0000000..629ae21
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
@@ -0,0 +1,69 @@
+
+Section "Files"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Generic Keyboard"
+    Driver        "evdev"
+    Option        "CoreKeyboard"
+    Option        "Device"      "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
+    Option        "XkbRules"    "xorg"
+    Option        "XkbModel"    "evdev"
+    Option        "XkbLayout"    "us"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Configured Mouse"
+    Driver        "mouse"
+    Option        "CorePointer"
+    Option        "Device"        "/dev/input/mice"
+    Option        "Protocol"        "ImPS/2"
+    Option        "ZAxisMapping"        "4 5"
+    Option        "Emulate3Buttons"    "true"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Qemu Tablet"
+    Driver        "evdev"
+    Option        "CorePointer"
+    Option        "Device"        "/dev/input/touchscreen0"
+    Option        "USB"           "on"
+EndSection
+
+Section "Device"
+    Identifier    "Graphics Controller"
+    Driver        "fbdev"
+EndSection
+
+Section "Monitor"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
+    # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz
+    Modeline "1024x600_60.00"   49.00  1024 1072 1168 1312  600 603 613 624 -hsync +vsync
+    # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
+    ModeLine "640x480"    25.2  640  656  752  800    480  490  492  525 -hsync -vsync
+    # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
+    ModeLine "640x480"    31.5  640  664  704  832    480  489  491  520 -hsync -vsync
+    # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
+    ModeLine "640x480"    31.5  640  656  720  840    480  481  484  500 -hsync -vsync
+    # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
+    ModeLine "640x480"    36.0  640  696  752  832    480  481  484  509 -hsync -vsync
+EndSection
+
+Section "Screen"
+    Identifier    "Default Screen"
+    Device        "Graphics Controller"
+    Monitor        "Generic Monitor"
+    SubSection "Display"
+        Modes     "640x480"
+    EndSubSection
+EndSection
+
+Section "ServerLayout"
+    Identifier    "Default Layout"
+    Screen        "Default Screen"
+    InputDevice    "Generic Keyboard"
+    # InputDevice    "Configured Mouse"
+    InputDevice    "QEMU Tablet"
+    Option         "AllowEmptyInput" "no"
+EndSection
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
new file mode 100644
index 0000000..629ae21
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
@@ -0,0 +1,69 @@
+
+Section "Files"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Generic Keyboard"
+    Driver        "evdev"
+    Option        "CoreKeyboard"
+    Option        "Device"      "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
+    Option        "XkbRules"    "xorg"
+    Option        "XkbModel"    "evdev"
+    Option        "XkbLayout"    "us"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Configured Mouse"
+    Driver        "mouse"
+    Option        "CorePointer"
+    Option        "Device"        "/dev/input/mice"
+    Option        "Protocol"        "ImPS/2"
+    Option        "ZAxisMapping"        "4 5"
+    Option        "Emulate3Buttons"    "true"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Qemu Tablet"
+    Driver        "evdev"
+    Option        "CorePointer"
+    Option        "Device"        "/dev/input/touchscreen0"
+    Option        "USB"           "on"
+EndSection
+
+Section "Device"
+    Identifier    "Graphics Controller"
+    Driver        "fbdev"
+EndSection
+
+Section "Monitor"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
+    # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz
+    Modeline "1024x600_60.00"   49.00  1024 1072 1168 1312  600 603 613 624 -hsync +vsync
+    # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
+    ModeLine "640x480"    25.2  640  656  752  800    480  490  492  525 -hsync -vsync
+    # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
+    ModeLine "640x480"    31.5  640  664  704  832    480  489  491  520 -hsync -vsync
+    # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
+    ModeLine "640x480"    31.5  640  656  720  840    480  481  484  500 -hsync -vsync
+    # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
+    ModeLine "640x480"    36.0  640  696  752  832    480  481  484  509 -hsync -vsync
+EndSection
+
+Section "Screen"
+    Identifier    "Default Screen"
+    Device        "Graphics Controller"
+    Monitor        "Generic Monitor"
+    SubSection "Display"
+        Modes     "640x480"
+    EndSubSection
+EndSection
+
+Section "ServerLayout"
+    Identifier    "Default Layout"
+    Screen        "Default Screen"
+    InputDevice    "Generic Keyboard"
+    # InputDevice    "Configured Mouse"
+    InputDevice    "QEMU Tablet"
+    Option         "AllowEmptyInput" "no"
+EndSection
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf
new file mode 100644
index 0000000..629ae21
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf
@@ -0,0 +1,69 @@
+
+Section "Files"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Generic Keyboard"
+    Driver        "evdev"
+    Option        "CoreKeyboard"
+    Option        "Device"      "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
+    Option        "XkbRules"    "xorg"
+    Option        "XkbModel"    "evdev"
+    Option        "XkbLayout"    "us"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Configured Mouse"
+    Driver        "mouse"
+    Option        "CorePointer"
+    Option        "Device"        "/dev/input/mice"
+    Option        "Protocol"        "ImPS/2"
+    Option        "ZAxisMapping"        "4 5"
+    Option        "Emulate3Buttons"    "true"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Qemu Tablet"
+    Driver        "evdev"
+    Option        "CorePointer"
+    Option        "Device"        "/dev/input/touchscreen0"
+    Option        "USB"           "on"
+EndSection
+
+Section "Device"
+    Identifier    "Graphics Controller"
+    Driver        "fbdev"
+EndSection
+
+Section "Monitor"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
+    # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz
+    Modeline "1024x600_60.00"   49.00  1024 1072 1168 1312  600 603 613 624 -hsync +vsync
+    # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
+    ModeLine "640x480"    25.2  640  656  752  800    480  490  492  525 -hsync -vsync
+    # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
+    ModeLine "640x480"    31.5  640  664  704  832    480  489  491  520 -hsync -vsync
+    # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
+    ModeLine "640x480"    31.5  640  656  720  840    480  481  484  500 -hsync -vsync
+    # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
+    ModeLine "640x480"    36.0  640  696  752  832    480  481  484  509 -hsync -vsync
+EndSection
+
+Section "Screen"
+    Identifier    "Default Screen"
+    Device        "Graphics Controller"
+    Monitor        "Generic Monitor"
+    SubSection "Display"
+        Modes     "640x480"
+    EndSubSection
+EndSection
+
+Section "ServerLayout"
+    Identifier    "Default Layout"
+    Screen        "Default Screen"
+    InputDevice    "Generic Keyboard"
+    # InputDevice    "Configured Mouse"
+    InputDevice    "QEMU Tablet"
+    Option         "AllowEmptyInput" "no"
+EndSection
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf
new file mode 100644
index 0000000..629ae21
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf
@@ -0,0 +1,69 @@
+
+Section "Files"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Generic Keyboard"
+    Driver        "evdev"
+    Option        "CoreKeyboard"
+    Option        "Device"      "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
+    Option        "XkbRules"    "xorg"
+    Option        "XkbModel"    "evdev"
+    Option        "XkbLayout"    "us"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Configured Mouse"
+    Driver        "mouse"
+    Option        "CorePointer"
+    Option        "Device"        "/dev/input/mice"
+    Option        "Protocol"        "ImPS/2"
+    Option        "ZAxisMapping"        "4 5"
+    Option        "Emulate3Buttons"    "true"
+EndSection
+
+Section "InputDevice"
+    Identifier    "Qemu Tablet"
+    Driver        "evdev"
+    Option        "CorePointer"
+    Option        "Device"        "/dev/input/touchscreen0"
+    Option        "USB"           "on"
+EndSection
+
+Section "Device"
+    Identifier    "Graphics Controller"
+    Driver        "fbdev"
+EndSection
+
+Section "Monitor"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
+    # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz
+    Modeline "1024x600_60.00"   49.00  1024 1072 1168 1312  600 603 613 624 -hsync +vsync
+    # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
+    ModeLine "640x480"    25.2  640  656  752  800    480  490  492  525 -hsync -vsync
+    # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
+    ModeLine "640x480"    31.5  640  664  704  832    480  489  491  520 -hsync -vsync
+    # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
+    ModeLine "640x480"    31.5  640  656  720  840    480  481  484  500 -hsync -vsync
+    # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
+    ModeLine "640x480"    36.0  640  696  752  832    480  481  484  509 -hsync -vsync
+EndSection
+
+Section "Screen"
+    Identifier    "Default Screen"
+    Device        "Graphics Controller"
+    Monitor        "Generic Monitor"
+    SubSection "Display"
+        Modes     "640x480"
+    EndSubSection
+EndSection
+
+Section "ServerLayout"
+    Identifier    "Default Layout"
+    Screen        "Default Screen"
+    InputDevice    "Generic Keyboard"
+    # InputDevice    "Configured Mouse"
+    InputDevice    "QEMU Tablet"
+    Option         "AllowEmptyInput" "no"
+EndSection
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
index 970b4bd..3c29f8b 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/base"
 LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "file://xorg.conf"
 
-- 
1.7.5.4

[PATCH 3/3] qemux86-64, qemux86: Override XSERVER variable

[Khem Raj]

Now qemu.inc sets a weak definition which is
not what we want for x86_64 and x86

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/conf/machine/qemux86-64.conf |    2 +-
 meta/conf/machine/qemux86.conf    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 129fe9f..b381627 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # We bypass swrast but we need it to be present for X to load correctly
-XSERVER ?= "xserver-xorg \
+XSERVER = "xserver-xorg \
            mesa-dri-driver-swrast \
            xf86-input-vmmouse \
            xf86-input-keyboard \
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 246d5a0..5b25b2f 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # We bypass swrast but we need it to be present for X to load correctly
-XSERVER ?= "xserver-xorg \
+XSERVER = "xserver-xorg \
            mesa-dri-driver-swrast \
            xf86-input-vmmouse \
            xf86-input-keyboard \
-- 
1.7.5.4

Re: [PATCH 3/3] qemux86-64, qemux86: Override XSERVER variable

[Richard Purdie]

On Wed, 2012-05-02 at 20:35 -0700, Khem Raj wrote:
> Now qemu.inc sets a weak definition which is
> not what we want for x86_64 and x86
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/conf/machine/qemux86-64.conf |    2 +-
>  meta/conf/machine/qemux86.conf    |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

We probably want to keep the weak setting but do it by fixing the
ordering so this happens before the include of qemu.inc...

Cheers,

Richard


> diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
> index 129fe9f..b381627 100644
> --- a/meta/conf/machine/qemux86-64.conf
> +++ b/meta/conf/machine/qemux86-64.conf
> @@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage"
>  SERIAL_CONSOLE = "115200 ttyS0"
>  
>  # We bypass swrast but we need it to be present for X to load correctly
> -XSERVER ?= "xserver-xorg \
> +XSERVER = "xserver-xorg \
>             mesa-dri-driver-swrast \
>             xf86-input-vmmouse \
>             xf86-input-keyboard \
> diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
> index 246d5a0..5b25b2f 100644
> --- a/meta/conf/machine/qemux86.conf
> +++ b/meta/conf/machine/qemux86.conf
> @@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage"
>  SERIAL_CONSOLE = "115200 ttyS0"
>  
>  # We bypass swrast but we need it to be present for X to load correctly
> -XSERVER ?= "xserver-xorg \
> +XSERVER = "xserver-xorg \
>             mesa-dri-driver-swrast \
>             xf86-input-vmmouse \
>             xf86-input-keyboard \

Re: [PATCH 3/3] qemux86-64, qemux86: Override XSERVER variable

[Khem Raj]

On Thu, May 3, 2012 at 7:35 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> We probably want to keep the weak setting but do it by fixing the
> ordering so this happens before the include of qemu.inc...
>

Thanks. I have revised the patch

> Cheers,
>
> Richard
>

Re: [PATCH 3/3] qemux86-64, qemux86: Override XSERVER variable

[Chris Larson]

On Thu, May 3, 2012 at 7:46 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On Thu, May 3, 2012 at 7:35 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>>
>> We probably want to keep the weak setting but do it by fixing the
>> ordering so this happens before the include of qemu.inc...
>>
>
> Thanks. I have revised the patch

??= may be of use here (though I haven't looked at the files in
particular, it seems appropriate)
-- 
Christopher Larson

Re: [PATCH 3/3] qemux86-64, qemux86: Override XSERVER variable

[Khem Raj]

On Thu, May 3, 2012 at 9:47 AM, Chris Larson <clarson@kergoth.com> wrote:
> ??= may be of use here (though I haven't looked at the files in
> particular, it seems appropriate)

I tried that and it started to build kdrive for qemuarm

Re: [PATCH 3/3] qemux86-64, qemux86: Override XSERVER variable

[Khem Raj]

On Thu, May 3, 2012 at 10:03 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On Thu, May 3, 2012 at 9:47 AM, Chris Larson <clarson@kergoth.com> wrote:
>> ??= may be of use here (though I haven't looked at the files in
>> particular, it seems appropriate)
>
> I tried that and it started to build kdrive for qemuarm

I have now made it to use ??= which simplified  the patches I have updated
the pull request

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

Please consider.

Re: [PATCH 0/3] Enable xserver-xorg for all qemumachines

[Saul Wold]

On 05/02/2012 08:35 PM, Khem Raj wrote:
> Currently we use kdrive for all qemu machines except x86 and x86_64
> this patchset enables it for other qemu machines too
>
> I did not delete the kdrive recipes intentionally since I saw that
> there were some images which were using kdrive as xserver
>
> I have successfully sato image in qemumips qemuarm and qemuppc
>
Khem,

Not sure what I am doing differently, but I am not getting the xserver 
to start on at least ppc and mips (two that I tried just now).

Are you build a Yocto sato image or oe-core sato image?

I get the following on a ppc:

Fatal server error:
no screens found
xinit: giving up
xinit: unable to connect to X server: No such file or directory
xinit: server error


Sau!


> The following changes since commit 35b5fb2dd2131d4c7dc6635c14c6e08ea6926457:
>
>    eglibc-package: remove /var (2012-05-01 12:36:18 +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
>    qemux86-64,qemux86: Override XSERVER variable
>
>   meta/conf/machine/include/qemu.inc                 |    9 ++-
>   meta/conf/machine/qemux86-64.conf                  |    2 +-
>   meta/conf/machine/qemux86.conf                     |    2 +-
>   .../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 +-
>   9 files changed, 356 insertions(+), 4 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
>

Re: [PATCH 0/3] Enable xserver-xorg for all qemumachines

[Khem Raj]

On Tue, May 8, 2012 at 3:06 PM, Saul Wold <sgw@linux.intel.com> wrote:
>>
> Khem,
>
> Not sure what I am doing differently, but I am not getting the xserver to
> start on at least ppc and mips (two that I tried just now).
>
> Are you build a Yocto sato image or oe-core sato image?
>
> I get the following on a ppc:
>
> Fatal server error:
> no screens found
> xinit: giving up
> xinit: unable to connect to X server: No such file or directory
> xinit: server error
>

hmmm I have booted core-image-sato but I have bare OE-Core
Do you have


http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/qemu-xserver-xorg&id=8a60dabb7902b7be42d06cb735e96248e2e67dba

is some layer on top changing it in some way ?

Re: [PATCH 0/3] Enable xserver-xorg for all qemumachines

[Khem Raj]

On Tue, May 8, 2012 at 3:09 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Tue, May 8, 2012 at 3:06 PM, Saul Wold <sgw@linux.intel.com> wrote:
>>>
>> Khem,
>>
>> Not sure what I am doing differently, but I am not getting the xserver to
>> start on at least ppc and mips (two that I tried just now).
>>
>> Are you build a Yocto sato image or oe-core sato image?
>>
>> I get the following on a ppc:
>>
>> Fatal server error:
>> no screens found
>> xinit: giving up
>> xinit: unable to connect to X server: No such file or directory
>> xinit: server error
>>
>
> hmmm I have booted core-image-sato but I have bare OE-Core
> Do you have
>
>
> http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/qemu-xserver-xorg&id=8a60dabb7902b7be42d06cb735e96248e2e67dba
>
> is some layer on top changing it in some way ?

hmmm another think I have is this patch
http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/misc&id=955dee621361e01627ebfde152f25873070cf301

which deletes kdrive recipes. I did not propose it for inclusion yet
but I wonder if there is any mix and match happening when these
recipes are not deleted.
You can cherry-pick it and see if that helps.

Re: [PATCH 0/3] Enable xserver-xorg for all qemumachines

[Saul Wold]

On 05/08/2012 03:18 PM, Khem Raj wrote:
> On Tue, May 8, 2012 at 3:09 PM, Khem Raj<raj.khem@gmail.com>  wrote:
>> On Tue, May 8, 2012 at 3:06 PM, Saul Wold<sgw@linux.intel.com>  wrote:
>>>>
>>> Khem,
>>>
>>> Not sure what I am doing differently, but I am not getting the xserver to
>>> start on at least ppc and mips (two that I tried just now).
>>>
>>> Are you build a Yocto sato image or oe-core sato image?
>>>
>>> I get the following on a ppc:
>>>
>>> Fatal server error:
>>> no screens found
>>> xinit: giving up
>>> xinit: unable to connect to X server: No such file or directory
>>> xinit: server error
>>>
>>
>> hmmm I have booted core-image-sato but I have bare OE-Core
>> Do you have
>>
>>
>> http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/qemu-xserver-xorg&id=8a60dabb7902b7be42d06cb735e96248e2e67dba
>>
>> is some layer on top changing it in some way ?
>
> hmmm another think I have is this patch
> http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/misc&id=955dee621361e01627ebfde152f25873070cf301
>
> which deletes kdrive recipes. I did not propose it for inclusion yet
> but I wonder if there is any mix and match happening when these
> recipes are not deleted.
> You can cherry-pick it and see if that helps.
>
So I found that task-core-x11.bb also sets XSERVER

XSERVER ?= "xserver-kdrive-fbdev"

And this was being picked up it seems when I did the build.

I commented that line out and it worked correctly.

That seems wrong, since I thought the ??= should not allow the ?= to 
override, or do I have it backwards?

Sau!




>

Re: [PATCH 0/3] Enable xserver-xorg for all qemumachines

[Khem Raj]

On Tue, May 8, 2012 at 4:50 PM, Saul Wold <sgw@linux.intel.com> wrote:
> On 05/08/2012 03:18 PM, Khem Raj wrote:
>>
>> On Tue, May 8, 2012 at 3:09 PM, Khem Raj<raj.khem@gmail.com>  wrote:
>>>
>>> On Tue, May 8, 2012 at 3:06 PM, Saul Wold<sgw@linux.intel.com>  wrote:
>>>>>
>>>>>
>>>> Khem,
>>>>
>>>> Not sure what I am doing differently, but I am not getting the xserver
>>>> to
>>>> start on at least ppc and mips (two that I tried just now).
>>>>
>>>> Are you build a Yocto sato image or oe-core sato image?
>>>>
>>>> I get the following on a ppc:
>>>>
>>>> Fatal server error:
>>>> no screens found
>>>> xinit: giving up
>>>> xinit: unable to connect to X server: No such file or directory
>>>> xinit: server error
>>>>
>>>
>>> hmmm I have booted core-image-sato but I have bare OE-Core
>>> Do you have
>>>
>>>
>>>
>>> http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/qemu-xserver-xorg&id=8a60dabb7902b7be42d06cb735e96248e2e67dba
>>>
>>> is some layer on top changing it in some way ?
>>
>>
>> hmmm another think I have is this patch
>>
>> http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/misc&id=955dee621361e01627ebfde152f25873070cf301
>>
>> which deletes kdrive recipes. I did not propose it for inclusion yet
>> but I wonder if there is any mix and match happening when these
>> recipes are not deleted.
>> You can cherry-pick it and see if that helps.
>>
> So I found that task-core-x11.bb also sets XSERVER
>
> XSERVER ?= "xserver-kdrive-fbdev"
>
> And this was being picked up it seems when I did the build.
>
> I commented that line out and it worked correctly.
>
> That seems wrong, since I thought the ??= should not allow the ?= to
> override, or do I have it backwards?


I think that was the real problem why my ??= was not working thanks
for finding it out. I have gone ahead and posted a v2 of this patch
series which should now
work out better.

>
> Sau!
>
>
>
>
>>
>

Re: [PATCH 0/3] Enable xserver-xorg for all qemumachines

[Saul Wold]

On 05/02/2012 08:35 PM, Khem Raj wrote:
> Currently we use kdrive for all qemu machines except x86 and x86_64
> this patchset enables it for other qemu machines too
>
> I did not delete the kdrive recipes intentionally since I saw that
> there were some images which were using kdrive as xserver
>
> I have successfully sato image in qemumips qemuarm and qemuppc
>

Khem,

Not sure if you saw this error:

ERROR: Multiple .bb files are due to be built which each provide 
virtual/libgl 
(/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-mips/build/meta/recipes-graphics/mesa/mesa-dri_7.11.bb 
/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-mips/build/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb).
  This usually means one provides something the other doesn't and should.

I think this might be related to your change, I need to confirm it still.

Builds are completeing but the error exists on all non-x86* qemu machines

Thanks

Sau!

> The following changes since commit 35b5fb2dd2131d4c7dc6635c14c6e08ea6926457:
>
>    eglibc-package: remove /var (2012-05-01 12:36:18 +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
>    qemux86-64,qemux86: Override XSERVER variable
>
>   meta/conf/machine/include/qemu.inc                 |    9 ++-
>   meta/conf/machine/qemux86-64.conf                  |    2 +-
>   meta/conf/machine/qemux86.conf                     |    2 +-
>   .../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 +-
>   9 files changed, 356 insertions(+), 4 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
>

Re: [PATCH 0/3] Enable xserver-xorg for all qemumachines

[Khem Raj]

On Thu, May 10, 2012 at 9:07 PM, Saul Wold <sgw@linux.intel.com> wrote:
>
>
> ERROR: Multiple .bb files are due to be built which each provide
> virtual/libgl
> (/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-mips/build/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
> /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-mips/build/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb).
>  This usually means one provides something the other doesn't and should.
>
> I think this might be related to your change, I need to confirm it still.
>
> Builds are completeing but the error exists on all non-x86* qemu machines

interesting I do not see this error on bare oe-core. Do you have some layer
which could be doing something to virtual/libgl provide

Re: [PATCH 0/3] Enable xserver-xorg for all qemumachines

[Saul Wold]

On 05/02/2012 08:35 PM, Khem Raj wrote:
> Currently we use kdrive for all qemu machines except x86 and x86_64
> this patchset enables it for other qemu machines too
>
> I did not delete the kdrive recipes intentionally since I saw that
> there were some images which were using kdrive as xserver
>
> I have successfully sato image in qemumips qemuarm and qemuppc
>
> The following changes since commit 35b5fb2dd2131d4c7dc6635c14c6e08ea6926457:
>
>    eglibc-package: remove /var (2012-05-01 12:36:18 +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
>    qemux86-64,qemux86: Override XSERVER variable
>
>   meta/conf/machine/include/qemu.inc                 |    9 ++-
>   meta/conf/machine/qemux86-64.conf                  |    2 +-
>   meta/conf/machine/qemux86.conf                     |    2 +-
>   .../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 +-
>   9 files changed, 356 insertions(+), 4 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
>
Khem,

Finally merged this into OE-Core, next step will be to look at updating 
the xserver!  This is something I think that we will be looking into.

Thanks for this contribution

	Sau!