summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/qemux86.conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-22 13:15:20 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-25 11:06:30 (GMT)
commit039a2d006b7349822509ae612f41e24b12b631a6 (patch)
tree40131895b574d22118664892ba4968a31534a426 /meta/conf/machine/qemux86.conf
parentdffe253336f4cc1999ad2a2323d346bfa5f22047 (diff)
downloadpoky-039a2d006b7349822509ae612f41e24b12b631a6.tar.gz
conf/machine/tune: Overhaul tune include file variables
There is currently consideradble confusion over how the tune files operate and how these interact with the rest of the build system. This update/overhaul changes things so the tune files are primarily resonsible for setting: TUNE_ARCH - What was formerly set as TARGET_ARCH and is the value that represents the architecture we're targetting. TUNE_PKGARCH - The value that represents the tune confuration that this set of tune parameters results in. This allows the significant improvement that the core can now always determine the target architecture value, even when TARGET_ARCH needs to be reset to something different and likewise, there is one package architecture variable the core can reference allowing simplification of the BASE_PACKAGE_ARCH, PACKAGE_ARCH and FEED_ARCH variables. (From OE-Core rev: a10de4cf8b424ee95c8e283e75d486be5b3b8eac) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/qemux86.conf')
-rw-r--r--meta/conf/machine/qemux86.conf4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 8b14731..5d0d03e 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -2,13 +2,12 @@
2#@NAME: common_pc 2#@NAME: common_pc
3#@DESCRIPTION: Machine configuration for running a common x86 3#@DESCRIPTION: Machine configuration for running a common x86
4 4
5TARGET_ARCH = "i586"
6
7PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" 5PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
8PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 6PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
9PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" 7PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
10PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" 8PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
11 9
10require conf/machine/include/tune-i586.inc
12require conf/machine/include/qemu.inc 11require conf/machine/include/qemu.inc
13 12
14MACHINE_FEATURES += "x86" 13MACHINE_FEATURES += "x86"
@@ -31,4 +30,3 @@ GLIBC_EXTRA_OECONF = "--with-tls"
31 30
32MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" 31MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
33 32
34TARGET_CC_ARCH = "-march=i586"