From: Tom Zanussi Date: Sun, 1 Jul 2012 15:56:12 +0000 (-0500) Subject: qemumachines: make MACHINE_FEATURES append follow qemu.inc include X-Git-Tag: 2015-4~10115 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4f336e5f416df382fdd2b405314741164d537b22;p=openembedded-core.git qemumachines: make MACHINE_FEATURES append follow qemu.inc include 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 --- diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 2e361a5cab..998ef60401 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 ad840c0498..57e480c851 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"