summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2011-10-03 12:07:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-04 13:46:45 +0100
commit1c1b6059f6ba06d639876dc13576ce70434a68ca (patch)
treea17c7715b8f1877c3c9a01c8262792190a44f154 /documentation
parent611d92f106cb3c86a9c0b8e81e688ef77c8a6f19 (diff)
downloadpoky-1c1b6059f6ba06d639876dc13576ce70434a68ca.tar.gz
documentation/adt-manual: changes for Jessica's review.
I made several changes based on feedback from Jessica Zhang. 1. Removed "SDKVERSION" as a way of identifying the directory in which a toolchain tarball is installed. I replaced with "1.1" 2. Cleaned up the bitbake command verbage to consistently use 'bitbake' command. 3. Cleaned up an erroneous reference to the toolchain environment setup scripts. I was referring the user to the oe-init-build-env area. 4. Changed wording to indicate that the toolchain tarball is generated after running bitbake rather than installing the toolchain. 5. Replaced the gmae tarball file used in an example to be the regular taball. (From yocto-docs rev: f7c3e4f4a666121a29825099d451eab1accb0616) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/adt-manual/adt-eclipse.xml2
-rw-r--r--documentation/adt-manual/adt-prepare.xml30
2 files changed, 15 insertions, 17 deletions
diff --git a/documentation/adt-manual/adt-eclipse.xml b/documentation/adt-manual/adt-eclipse.xml
index 8272bae0be..df70bd4e49 100644
--- a/documentation/adt-manual/adt-eclipse.xml
+++ b/documentation/adt-manual/adt-eclipse.xml
@@ -294,7 +294,7 @@
294 </para></listitem> 294 </para></listitem>
295 <listitem><para><emphasis>Point to the Toolchain:</emphasis> 295 <listitem><para><emphasis>Point to the Toolchain:</emphasis>
296 If you are using a stand-alone pre-built toolchain, you should be pointing to the 296 If you are using a stand-alone pre-built toolchain, you should be pointing to the
297 <filename>/opt/poky/$SDKVERSION</filename> directory. 297 <filename>/opt/poky/1.1</filename> directory.
298 This is the location for toolchains installed by the ADT Installer or by hand. 298 This is the location for toolchains installed by the ADT Installer or by hand.
299 Sections "<link linkend='configuring-and-running-the-adt-installer-script'>Configuring 299 Sections "<link linkend='configuring-and-running-the-adt-installer-script'>Configuring
300 and Running the ADT Installer Script</link>" and 300 and Running the ADT Installer Script</link>" and
diff --git a/documentation/adt-manual/adt-prepare.xml b/documentation/adt-manual/adt-prepare.xml
index a9fb15e87e..8c98498daf 100644
--- a/documentation/adt-manual/adt-prepare.xml
+++ b/documentation/adt-manual/adt-prepare.xml
@@ -181,7 +181,7 @@
181 <para> 181 <para>
182 Once the installation completes, the ADT, which includes the cross-toolchain, is installed. 182 Once the installation completes, the ADT, which includes the cross-toolchain, is installed.
183 You will notice environment setup files for the cross-toolchain in 183 You will notice environment setup files for the cross-toolchain in
184 <filename>/opt/poky/$SDKVERSION</filename>, 184 <filename>/opt/poky/1.1</filename>,
185 and image tarballs in the <filename>adt-installer</filename> 185 and image tarballs in the <filename>adt-installer</filename>
186 directory according to your installer configurations, and the target sysroot located 186 directory according to your installer configurations, and the target sysroot located
187 according to the <filename>YOCTOADT_TARGET_SYSROOT_LOC_&lt;arch&gt;</filename> variable 187 according to the <filename>YOCTOADT_TARGET_SYSROOT_LOC_&lt;arch&gt;</filename> variable
@@ -204,7 +204,7 @@
204 Follow these steps: 204 Follow these steps:
205 <orderedlist> 205 <orderedlist>
206 <listitem><para>Go to 206 <listitem><para>Go to
207 <ulink url='http://autobuilder.yoctoproject.org/downloads/yocto-1.1/toolchain'></ulink> 207 <ulink url='http://www.yoctoproject.org/downloads/yocto-1.1/toolchain'></ulink>
208 and find the folder that matches your host development system 208 and find the folder that matches your host development system
209 (i.e. <filename>i586</filename> for 32-bit machines or 209 (i.e. <filename>i586</filename> for 32-bit machines or
210 <filename>x86_64</filename> for 64-bit machines).</para></listitem> 210 <filename>x86_64</filename> for 64-bit machines).</para></listitem>
@@ -214,10 +214,8 @@
214 you are going to use your cross-toolchain for an Intel-based 32-bit target, go into the 214 you are going to use your cross-toolchain for an Intel-based 32-bit target, go into the
215 <filename>x86_64</filename> folder and download the following tarball: 215 <filename>x86_64</filename> folder and download the following tarball:
216 <literallayout class='monospaced'> 216 <literallayout class='monospaced'>
217 yocto-eglibc-x86_64-i586-toolchain-gmae-1.1.tar.bz2 217 yocto-eglibc-x86_64-i586-toolchain-1.1.tar.bz2
218 </literallayout> 218 </literallayout>
219 The cross-toolchain tarballs provided by the Yocto Project support development
220 of GNOME platforms on mobile devices (GMAE).
221 <note><para>As an alternative to steps one and two, you can build the toolchain tarball 219 <note><para>As an alternative to steps one and two, you can build the toolchain tarball
222 if you have a Yocto Project build tree. 220 if you have a Yocto Project build tree.
223 If you need GMAE, you should use the <filename>bitbake meta-toolchain-gmae</filename> 221 If you need GMAE, you should use the <filename>bitbake meta-toolchain-gmae</filename>
@@ -233,7 +231,7 @@
233 </para></note></para></listitem> 231 </para></note></para></listitem>
234 <listitem><para>Make sure you are in the root directory with root privileges and then expand 232 <listitem><para>Make sure you are in the root directory with root privileges and then expand
235 the tarball. 233 the tarball.
236 The tarball expands into <filename>/opt/poky/$SDKVERSION</filename>. 234 The tarball expands into <filename>/opt/poky/1.1</filename>.
237 Once the tarball is expanded, the cross-toolchain is installed. 235 Once the tarball is expanded, the cross-toolchain is installed.
238 You will notice environment setup files for the cross-toolchain in the directory. 236 You will notice environment setup files for the cross-toolchain in the directory.
239 </para></listitem> 237 </para></listitem>
@@ -260,8 +258,8 @@
260 files.</para></listitem> 258 files.</para></listitem>
261 <listitem><para>At this point, you should be sure that the 259 <listitem><para>At this point, you should be sure that the
262 <filename>MACHINE</filename> variable 260 <filename>MACHINE</filename> variable
263 in the <filename>local.conf</filename> file found in the Yocto Project 261 in the <filename>local.conf</filename> file found in the
264 file structure's <filename>conf</filename> directory 262 <filename>conf</filename> directory of the Yocto Project build directory
265 is set for the target architecture. 263 is set for the target architecture.
266 Comments within the <filename>local.conf</filename> file list the values you 264 Comments within the <filename>local.conf</filename> file list the values you
267 can use for the <filename>MACHINE</filename> variable. 265 can use for the <filename>MACHINE</filename> variable.
@@ -274,12 +272,12 @@
274 cross-toolchain installation. 272 cross-toolchain installation.
275 <note>If change out of your working directory after you 273 <note>If change out of your working directory after you
276 <filename>source</filename> the environment setup script and before you run 274 <filename>source</filename> the environment setup script and before you run
277 the BitBake command, the command might not work. 275 the <filename>bitbake</filename> command, the command might not work.
278 Be sure to run the <filename>bitbake</filename> command immediately 276 Be sure to run the <filename>bitbake</filename> command immediately
279 after checking or editing the <filename>local.conf</filename> but without 277 after checking or editing the <filename>local.conf</filename> but without
280 changing out of your working directory.</note> 278 changing out of your working directory.</note>
281 Once BitBake finishes, the cross-toolchain is installed within the Yocto Project 279 Once the <filename>bitbake</filename> command finishes,
282 build tree. 280 the tarball for the cross-toolchain is generated within the Yocto Project build tree.
283 You will notice environment setup files for the cross-toolchain in the 281 You will notice environment setup files for the cross-toolchain in the
284 Yocto Project build tree in the <filename>tmp</filename> directory. 282 Yocto Project build tree in the <filename>tmp</filename> directory.
285 Setup script filenames contain the strings <filename>environment-setup</filename>. 283 Setup script filenames contain the strings <filename>environment-setup</filename>.
@@ -294,12 +292,12 @@
294 292
295 <para> 293 <para>
296 Before you can develop using the cross-toolchain, you need to set up the 294 Before you can develop using the cross-toolchain, you need to set up the
297 cross-development environment by sourcing the environment setup script. 295 cross-development environment by sourcing the toolchain's environment setup script.
298 If you used the ADT Installer or used an existing ADT tarball to install the ADT, 296 If you used the ADT Installer or used an existing ADT tarball to install the ADT,
299 then you can find this script in the <filename>/opt/poky/$SDKVERSION</filename> 297 then you can find this script in the <filename>/opt/poky/1.1</filename>
300 directory. 298 directory.
301 If you installed the toolchain in the build tree, you can find the environment setup 299 If you installed the toolchain in the build tree, you can find the environment setup
302 scripts in the Yocto Project build tree's <filename>tmp</filename> directory. 300 script for the toolchain in the Yocto Project build tree's <filename>tmp</filename> directory.
303 </para> 301 </para>
304 302
305 <para> 303 <para>
@@ -307,7 +305,7 @@
307 which you are developing. 305 which you are developing.
308 Environment setup scripts begin with the string “<filename>environment-setup</filename>” 306 Environment setup scripts begin with the string “<filename>environment-setup</filename>”
309 and include as part of their name the architecture. 307 and include as part of their name the architecture.
310 For example, the environment setup script for a 64-bit IA-based architecture would 308 For example, the toolchain environment setup script for a 64-bit IA-based architecture would
311 be the following: 309 be the following:
312 <literallayout class='monospaced'> 310 <literallayout class='monospaced'>
313 /opt/poky/1.1/environment-setup-x86_64-poky-linux 311 /opt/poky/1.1/environment-setup-x86_64-poky-linux