summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-09 11:18:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-09 11:18:28 +0000
commit082aff4753170f30da261726e14fc27a6de4e8d9 (patch)
treecdb9057b13be4faad2a9a1e31baa0fc2fe494e08
parent092f132a472f16415b224ea1d855e00f87954232 (diff)
parent33b3e596328897dc5808420417f28f1024cca1d2 (diff)
downloadpoky-082aff4753170f30da261726e14fc27a6de4e8d9.tar.gz
Merge branch 'jzhang/i686' of ssh://git.pokylinux.org/poky-contrib
-rw-r--r--meta/conf/local.conf.sample6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 8ac31d8f77..d9f7098f0c 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -132,10 +132,10 @@ BBINCLUDELOGS = "yes"
132ENABLE_BINARY_LOCALE_GENERATION = "1" 132ENABLE_BINARY_LOCALE_GENERATION = "1"
133 133
134# The architecture to build SDK items for, by setting this you can build SDK 134# The architecture to build SDK items for, by setting this you can build SDK
135# packages for architectures other than the host i.e. building i586 packages 135# packages for architectures other than the host i.e. building i686 packages
136# on an x86_64 host. 136# on an x86_64 host.
137# Supported values are i586 and x86_64 137# Supported values are i686 and x86_64
138#SDKMACHINE ?= "i586" 138#SDKMACHINE ?= "i686"
139 139
140# Poky can try and fetch packaged-staging packages from a http, https or ftp 140# Poky can try and fetch packaged-staging packages from a http, https or ftp
141# mirror. Set this variable to the root of a pstage directory on a server. 141# mirror. Set this variable to the root of a pstage directory on a server.