[PATCH 0/2] yocto-bsp: template fixes

[PATCH 0/2] yocto-bsp: template fixes

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

This updates some Yocto BSP templates to fix some recent metadata changes
that caused the problems seen in YOCTO #2559.

Please pull into poky/master.

The following changes since commit 4ff6160d909e2a39e357c8a51f37d803dab64d5d:
  Richard Purdie (1):
        methodpool: Improve method already seen error message

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib.git tzanussi/yocto-bugfix-2559
  http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/yocto-bugfix-2559

Tom Zanussi (2):
  yocto-bsp: update yocto-bsp machine.conf template
  yocto-bsp: update yocto-bsp xorg.conf templates

 .../arch/qemu/conf/machine/{{=machine}}.conf       |    7 +++++--
 .../xserver-xf86-config/{{=machine}}/xorg.conf     |    8 ++++++++
 ..."x86_64\": }} xserver-xf86-config_0.1.bbappend" |    2 --
 3 files changed, 13 insertions(+), 4 deletions(-)
 delete mode 100644 "scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == \"i386\" or qemuarch == \"x86_64\": }} xserver-xf86-config_0.1.bbappend"

[PATCH 1/2] yocto-bsp: update yocto-bsp machine.conf template

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

Some changes in the ordering assumptions of the qemu include rendered
X inoperative, fix those in the qemu machine template.

Fixes [YOCTO #2559]

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 .../arch/qemu/conf/machine/{{=machine}}.conf       |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
index 0e4ecad..1ab6e58 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
@@ -8,6 +8,7 @@
 PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}"
 PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"
 
+{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
 
@@ -22,13 +23,14 @@ require conf/machine/include/tune-i586.inc
 {{ if qemuarch == "x86_64": }}
 require conf/machine/include/tune-x86_64.inc
 {{ if qemuarch == "arm": }}
+require conf/machine/include/qemu.inc
 require conf/machine/include/tune-arm926ejs.inc
 {{ if qemuarch == "powerpc": }}
+require conf/machine/include/qemu.inc
 require conf/machine/include/tune-ppc603e.inc
 {{ if qemuarch == "mips": }}
-require conf/machine/include/tune-mips32.inc
-
 require conf/machine/include/qemu.inc
+require conf/machine/include/tune-mips32.inc
 
 {{ if qemuarch == "i386" or qemuarch == "x86_64": }}
 MACHINE_FEATURES += "x86"
@@ -42,6 +44,7 @@ XSERVER ?= "xserver-xorg \
            xf86-input-evdev \
            xf86-video-vmware \
            qemugl"
+require conf/machine/include/qemu.inc
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-- 
1.7.0.4

[PATCH 2/2] yocto-bsp: update yocto-bsp xorg.conf templates

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

The non-x86 qemu machines now require an xorg.conf, change the
templates accordingly.

Fixes [YOCTO #2559]

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 .../xserver-xf86-config/{{=machine}}/xorg.conf     |    8 ++++++++
 ..."x86_64\": }} xserver-xf86-config_0.1.bbappend" |    2 --
 2 files changed, 8 insertions(+), 2 deletions(-)
 delete mode 100644 "scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == \"i386\" or qemuarch == \"x86_64\": }} xserver-xf86-config_0.1.bbappend"

diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf
index 10a6d9a..1351980 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/{{=machine}}/xorg.conf
@@ -14,7 +14,11 @@ EndSection
 
 Section "InputDevice"
     Identifier    "Configured Mouse"
+{{ if qemuarch == "arm" or qemuarch == "powerpc" or qemuarch == "mips": }}
+    Driver        "mouse"
+{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
     Driver        "vmmouse"
+
     Option        "CorePointer"
     Option        "Device"        "/dev/input/mice"
     Option        "Protocol"        "ImPS/2"
@@ -32,7 +36,11 @@ EndSection
 
 Section "Device"
     Identifier    "Graphics Controller"
+{{ if qemuarch == "arm" or qemuarch == "powerpc" or qemuarch == "mips": }}
+    Driver        "fbdev"
+{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
     Driver        "vmware"
+
 EndSection
 
 Section "Monitor"
diff --git "a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == \"i386\" or qemuarch == \"x86_64\": }} xserver-xf86-config_0.1.bbappend" "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == \"i386\" or qemuarch == \"x86_64\": }} xserver-xf86-config_0.1.bbappend"
deleted file mode 100644
index d3420e0..0000000
--- "a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == \"i386\" or qemuarch == \"x86_64\": }} xserver-xf86-config_0.1.bbappend"	
+++ /dev/null
@@ -1,2 +0,0 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-- 
1.7.0.4

Re: [PATCH 0/2] yocto-bsp: template fixes

[Tom Zanussi]

ping?

On Mon, 2012-06-18 at 15:52 -0500, tom.zanussi@intel.com wrote:
> From: Tom Zanussi <tom.zanussi@intel.com>
> 
> This updates some Yocto BSP templates to fix some recent metadata changes
> that caused the problems seen in YOCTO #2559.
> 
> Please pull into poky/master.
> 
> The following changes since commit 4ff6160d909e2a39e357c8a51f37d803dab64d5d:
>   Richard Purdie (1):
>         methodpool: Improve method already seen error message
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib.git tzanussi/yocto-bugfix-2559
>   http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/yocto-bugfix-2559
> 
> Tom Zanussi (2):
>   yocto-bsp: update yocto-bsp machine.conf template
>   yocto-bsp: update yocto-bsp xorg.conf templates
> 
>  .../arch/qemu/conf/machine/{{=machine}}.conf       |    7 +++++--
>  .../xserver-xf86-config/{{=machine}}/xorg.conf     |    8 ++++++++
>  ..."x86_64\": }} xserver-xf86-config_0.1.bbappend" |    2 --
>  3 files changed, 13 insertions(+), 4 deletions(-)
>  delete mode 100644 "scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/{{ if qemuarch == \"i386\" or qemuarch == \"x86_64\": }} xserver-xf86-config_0.1.bbappend"
>