summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-03 14:52:41 (GMT)
committerSaul Wold <sgw@linux.intel.com>2011-08-04 01:47:47 (GMT)
commit04d30a921e4b71b37f0171a5ba1147bedb45f412 (patch)
tree40485612e18a85d2eec364ef60bf4f1b50ddbcb4
parentbc7d40b7c4d6c77961870c4cbdbf29eba0ed46fb (diff)
downloadpoky-04d30a921e4b71b37f0171a5ba1147bedb45f412.tar.gz
bitbake.conf/qemux86-64: Automate TRANSLATED_TARGET_ARCH
(From OE-Core rev: 6def7129cf7580a935c05cc05b7f803812d5bb18) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/conf/machine/qemux86-64.conf3
2 files changed, 1 insertions, 4 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index ac5d1f3..6f0b42c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -728,7 +728,7 @@ TARGET_ARCH[unexport] = "1"
728DISTRO[unexport] = "1" 728DISTRO[unexport] = "1"
729 729
730# Used by canadian-cross to handle string conversions on TARGET_ARCH where needed 730# Used by canadian-cross to handle string conversions on TARGET_ARCH where needed
731TRANSLATED_TARGET_ARCH ??= ${TARGET_ARCH} 731TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH', True).replace("_", "-")}"
732 732
733# Setup our default hash policy 733# Setup our default hash policy
734BB_SIGNATURE_HANDLER ?= "basic" 734BB_SIGNATURE_HANDLER ?= "basic"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 46d7d12..18a7513 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -2,9 +2,6 @@
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 = "x86_64"
6TRANSLATED_TARGET_ARCH = "x86-64"
7
8PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" 5PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
9PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 6PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
10PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" 7PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"