Patchwork [8/9] qemumachines: make MACHINE_FEATURES append follow qemu.inc include

login
register
mail settings
Submitter Tom Zanussi
Date July 3, 2012, 6:10 p.m.
Message ID <1270ddc19a4f865a6a13e694f0af940ed76f7570.1341338051.git.tom.zanussi@intel.com>
Download mbox | patch
Permalink /patch/31111/
State Accepted
Commit 4f336e5f416df382fdd2b405314741164d537b22
Headers show

Comments

Tom Zanussi - July 3, 2012, 6:10 p.m.
From: Tom Zanussi <tom.zanussi@intel.com>

qemu.inc does a straight assign to MACHINE_FEATURES so overwriting the
preceding append to MACHINE_FEATURES, so the MACHINE_FEATURES append
needs to be moved after the include.

This situation came about as a result of commit 71a4bf386:

    qemumachines: Enable xserver-xorg as default xserver

    For qemux86 and qemux86-64 include qemu.inc after defining XSERVER

which missed this side-effect (and maybe others).

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta/conf/machine/qemux86-64.conf |    4 ++--
 meta/conf/machine/qemux86.conf    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 2e361a5..998ef60 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -7,8 +7,6 @@  PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
 
 require conf/machine/include/tune-x86_64.inc
 
-MACHINE_FEATURES += "x86"
-
 KERNEL_IMAGETYPE = "bzImage"
 
 SERIAL_CONSOLE = "115200 ttyS0"
@@ -24,6 +22,8 @@  XSERVER ?= "xserver-xorg \
 
 require conf/machine/include/qemu.inc
 
+MACHINE_FEATURES += "x86"
+
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index ad840c0..57e480c 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -7,8 +7,6 @@  PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
 
 require conf/machine/include/tune-i586.inc
 
-MACHINE_FEATURES += "x86"
-
 KERNEL_IMAGETYPE = "bzImage"
 
 SERIAL_CONSOLE = "115200 ttyS0"
@@ -24,6 +22,8 @@  XSERVER ?= "xserver-xorg \
 
 require conf/machine/include/qemu.inc
 
+MACHINE_FEATURES += "x86"
+
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"